Merge branch 'gh-pages'

Conflicts:
	_site/index.html
	index.html