gh-pages publish
Merge branch 'master' into gh-pages
in-class changes