Merge branch 'master' into gh-pages
fixed final media query -- Hopefully!
Merge branch 'gh-pages'