Commits
Michael Q Larson committed 88e261ccf66M
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
