Converted media queries to em instead of px
Merge remote-tracking branch 'origin/master'