fix merge
Merge branch 'gh-pages' of https://github.com/flipcamp/engagingstudents into gh-pages
fixed some en dashes in bib