Commits

Michael Q Larson committed 0dcce677630M
Merge branch 'bonfire-improvement' of https://github.com/FreeCodeCamp/freecodecamp into bonfire-improvement Conflicts: public/css/main.less
Merge branch 'bonfire-improvement' of https://github.com/FreeCodeCamp/freecodecamp into bonfire-improvement Conflicts: public/css/main.less