Fixes
Fixes
Fixes
Merge branch 'Archive-Fixes'

Conflicts:
	inc/template-tags.php
	style.css
Fixes