Merge branch 'gh-pages'
index with styles
Merge branch 'master' into gh-pages