Renamed Website.html to index.html.
Merge branch 'master' into gh-pages