Initial commit of index.html
Fixed merge conflict between old index.html and recent index.html