history
Merge branch 'master' of https://github.com/TyGriffiths/Kolaches

Conflicts:
	home.html