Merge branch 'rob-branch'

Conflicts:

wp-content/themes/gruen/.sass-cache/cd1e86f896d6a9e103afcd338e1bbff04c22
e00b/_homepage.scssc

wp-content/themes/gruen/.sass-cache/cd1e86f896d6a9e103afcd338e1bbff04c22
e00b/_single-service.scssc

wp-content/themes/gruen/.sass-cache/d0414b9839219be49ebe47963a1c22e44f00
1e4f/_bootstrap-variables.scssc
	wp-content/themes/gruen/front-page.php
	wp-content/themes/gruen/sass/_bootstrap-variables.scss
	wp-content/themes/gruen/sass/site/pages/_homepage.scss
	wp-content/themes/gruen/sass/site/pages/_single-service.scss
	wp-content/themes/gruen/single-service.php
	wp-content/themes/gruen/style.css