Template changes
Merge branch 'master' of https://github.com/nickyshannon/miriam

Conflicts:
	wp-content/themes/miriamgrice/lib/dist/css/main.css