Still learning layout and MQs...
Merge branch 'master' of https://github.com/uptownnickbrown/cg-under-construction

Conflicts:
	css/styles.css