Add high-res mobile screens to breakpoints
Merge commit reset conflicts