Merge branch 'homer-tweaks' into gh-pages

Conflicts:
	contact.html
	fitness-blog.html
	group-training.html
	index.html
	personal-training-services.html
	personal-training.html
	reviews.html