Merge pull request #1 from charliegerard/master

remove index page
Recreate index.html
fix merge conflict