Merge branch 'FilterWork'
Merge branch 'master' of https://github.com/zlesperance/Holiday-Mailer
Fix Issue created in last merge
Merge pull request #25 from zlesperance/MergeFix

Merge fix