renamed to index.html to ensure default on webpage
Merge branch 'master' into Amy