updated index.html
fixed merge conflict with index.html
Merge branch 'master' of heroku.com:drbond-bitstarter-s-mooc into staging
edited out HEAD