Commits

Quincy Larson committed 79a396b9c83M
Merge branch 'patch-1' of https://github.com/tcyrus/FreeCodeCamp into staging Conflicts: server/views/coursewares/showHTML.jade
Merge branch 'patch-1' of https://github.com/tcyrus/FreeCodeCamp into staging Conflicts: server/views/coursewares/showHTML.jade