fix commits
Merge branch 'gh-pages'

Conflicts:
	web/index.html