de clercq fizes
mccandless fixes
Merge branch 'gh-pages' of github.com:flipcamp/engagingstudents2 into gh-pages