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