Updated
Merge branch 'develop' of https://github.com/jasonwollering/ColonialCandleFundraising into develop

Conflicts:
	content/css/site.css