I hope this works
Merge branch 'master' of https://github.com/BenJenkins/triathlontraining

Conflicts:
	blog-post-template.html
	css/style.css
	half-ironman-triathlons.html
	ironman-triathlons.html
	learn.html
	olympic-triathlons.html
	sprint-triathlons.html
	triathlon-blog.html
	triathlon-checklist.html