Merge branch 'gh-pages'
edited theme
Merge branch 'master' into gh-pages