Merge branch 'gh-pages'
changes main size on front page
Merge branch 'master' into gh-pages