lots
Merge branch 'master' of https://github.com/richardmax/harrington_theme

Conflicts:
	menu-filter-activities.php
	style.css
	taxonomy-time-out.php