combined media queries
updated readme
Merge branch 'master' into myblog