Changed media queries and added viewport meta tag
Merge remote-tracking branch 'origin/master'