Update index.html
fixed conflict
Merge branch 'podliy16-master'