merge with gh-pages
index.html not needed on master
Merge branch 'gh-pages'

Conflicts:
	.gitattributes
	index.html
WIP