Merge branch 'gh-pages'
formatting index page
Merge branch 'master' into gh-pages