initial
Merge branch 'gh-pages'

Conflicts:
	index.html
delete
Merge branch 'master' into gh-pages