Bootstraped index.html
Fixed merge conflict Bootstraped index.html