updates to resolve columns at smaller sizes
Merge branch 'master' of https://github.com/dhnelson1/TTW-Site-Redesign

Conflicts:
	blog.html
unknown--

resolving merge of temporary branch
resolving merged branch