added index.html
Merge branch 'new'

Conflicts:
	index.html