Commits
Michael Q Larson committed 2dbd59b7f12M
Merge branch 'ux-improvements' of https://github.com/FreeCodeCamp/freecodecamp into ux-improvements Conflicts: controllers/resources.js views/account/show.jade views/coursewares/showHTML.jade views/coursewares/showJS.jade views/partials/bonfires.jade
