Merge branch 'gh-pages'
testing more media queries
Merge branch 'master' into gh-pages