Update index.html
Fix conflict
Merge branch 'gh-pages'
Merge branch 'gh-pages'
Update index.html
Fix typo... @joevogel