Changed wording.
Merge branch 'master' of https://github.com/esickels/UC-Emails

Conflicts:
	whatsHappening/whatsHappeningEmail.html
tests