Updating gh-pages with newest content

Conflicts:
	index.html