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

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

Conflicts:
	index.html
Merge remote-tracking branch 'origin/master'