Commits

Quincy Larson committed ce0731df5f5M
Merge branch 'staging' of github.com:FreeCodeCamp/freecodecamp into staging Conflicts: server/boot/randomAPIs.js server/views/coursewares/showBonfire.jade server/views/partials/navbar.jade
Merge branch 'staging' of github.com:FreeCodeCamp/freecodecamp into staging Conflicts: server/boot/randomAPIs.js server/views/coursewares/showBonfire.jade server/views/partials/navbar.jade