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