lol removed index.html~
Merge branch 'master' of github.com:stopthespies/website