Merge branch 'master' into touchups
media queries added for 1280 and 1360, needs debugging
adjusted 1920 media query
fixed 1920 media query
Merge pull request #8 from yhordi/media_queries

Media queries