Updating index.html content
Merge branch 'master' into gh-pages