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

..

bonfires.json

initial commit

2015-03-08 23:20:23 -04:00

challenges.json

update announcements and move announcement modal back into learn-to-code view

2015-03-19 23:24:44 -07:00

comments.json

Fix minor bugs

2015-03-07 03:55:59 +09:00

coursewares.json

Merge branch 'master' into ux-improvements

2015-03-21 16:25:39 -07:00

seed.js

Merge branch 'master' into ux-improvements

2015-03-21 16:25:39 -07:00