bootstrap and index.html
Merge branch 'master' of https://github.com/Charliebarton/EmmaHack1