Commits

Michael Q Larson committed 108b2728792M
Merge branch 'coderbye' of https://github.com/FreeCodeCamp/freecodecamp into coderbye Conflicts: seed_data/coursewares.json
Merge branch 'coderbye' of https://github.com/FreeCodeCamp/freecodecamp into coderbye Conflicts: seed_data/coursewares.json