Update index.html
Update CNAME
Merge branch 'gh-pages'

Conflicts:
	CNAME