2nd try
Merge branch 'gh-pages'

Conflicts:
	index.html