add media queries for typography
fix merge conflict
Merge pull request #22 from mattwojo/media

Media