unit1: v2 (css with media queries)
Merge branch 'master' into gh-pages

unit 1: v2 (css with media queries)