media queries for ipad and iphone
resolved merge conflict