Puts the media query at the bottom of the stylesheet
Merge branch 'master' into gh-pages