Commits
Michael Q Larson committed 43810ccb0c7M
Merge branch 'ux-improvements' of https://github.com/terakilobyte/freecodecamp into terakilobyte-ux-improvements Conflicts: controllers/bonfire.js controllers/resources.js public/js/main.js views/bonfire/show.jade
