Commits

Berkeley Martinez committed e04470872e9M
Merge branch 'jameskopacz-patch-261' of https://github.com/jameskopacz/freecodecamp into jameskopacz-jameskopacz-patch-261 Conflicts: controllers/courseware.js
Merge branch 'jameskopacz-patch-261' of https://github.com/jameskopacz/freecodecamp into jameskopacz-jameskopacz-patch-261 Conflicts: controllers/courseware.js