Michael Q Larson 88e261ccf6 Merge branch 'master' into ux-improvements ... Conflicts: controllers/resources.js controllers/user.js seed_data/challenges.json views/account/show.jade views/coursewares/showHTML.jade views/coursewares/showJS.jade views/partials/bonfires.jade		2015-03-21 16:25:39 -07:00
..
lib	Merge branch 'master' into ux-improvements	2015-03-21 16:25:39 -07:00
themes	update the hackathon starter base app	2014-11-29 21:32:59 -08:00
main.less	Merge branch 'master' into ux-improvements	2015-03-21 16:25:39 -07:00