Commits

Michael Q Larson committed 4c0ff3b5edeM
Merge branch 'master' of https://github.com/FreeCodeCamp/freecodecamp into news Conflicts: views/partials/navbar.jade
Merge branch 'master' of https://github.com/FreeCodeCamp/freecodecamp into news Conflicts: views/partials/navbar.jade