Merge branch 'master' into gh-pages
changed layout
changed layout
Merge branch 'gh-pages'