Merge branch 'gh-pages'

Conflicts:
projects.html