media queries setup and sidebar replication
conflicts
conflicts
Merge branch 'master' into step1