Merge origin/gh-pages into gh-pages

Conflicts:
	index.html
Merge origin/gh-pages into gh-pages

Conflicts:
	index.html