conflicting
added font listing
single service changes
Merge branch 'rob-branch' of https://github.com/bookoo/gruen-testing into rob-branch

Conflicts:
	wp-content/themes/gruen/single-service.php
	wp-content/themes/gruen/style.css