update index.html
Merge branch 'rep1_master'

Conflicts:
	index.html