test
Merge branch 'testing'
added media queries for iphones