Merge remote-tracking branch 'origin/gh-pages' into gh-pages

Conflicts:
	index.html
Merge remote-tracking branch 'origin/gh-pages' into gh-pages