Update index.html
resolved conflict

Conflicts:
	index.html