Merge branch 'gh-pages'
Merge branch 'master' into gh-pages
320 media query fixed
Merge branch 'master' into gh-pages
Merge branch 'gh-pages'
Merge branch 'master' into gh-pages