Working index.html.
Merge branch 'staging'

Conflicts:
	index.html
New index.html