Merge branch 'master' into gh-pages
adding some info to the index page
Merge branch 'gh-pages'