add media queries for small screen
Merge branch 'master' into gh-pages