removed index.html from staging
using theirs
more changes to index.html
using theirs
updated index.html