Merge pull request #2 from charliegerard/master

remove index file
Recreate index.html
fix merge conflict