Merge branch 'master' into develop
add event name and year to certain emails so that it's obvious which event they're talking about.
Merge pull request #292 from EliAndrewC/fix_email_not_having_event

add event name and year to certain emails
Merge branch 'develop' of https://github.com/EliAndrewC/magfest into develop
Merge branch 'master' into develop