Resolved conflict re. name of index.html

Previously it was revol.html, but now it's index.html
Merge branch 'master' into gh-pages