Merge branch 'gh-pages' of github.com:swcarpentry/lesson-example into gh-pages