Iphone 6 responsiveness

Also removed <<<<HEAD etc…
added @media for port and lands