Adding index.html to see if that makes github pages work
oops, forgot a file
Merge branch 'master' into gh-pages