max-width
media queries
Merge branch 'master' into gh-pages