Merge remote-tracking branches 'origin/master' and 'origin/gh-pages'

Conflicts:
	index.html
Merge remote-tracking branches 'origin/master' and 'origin/gh-pages'

Conflicts:
	index.html