media queries
Merge branch 'master' of https://github.com/TxReplay/Advent-Calendar

Resolve conflicts