user Gen Emails
Email stuff
stuff
Merge branch 'master' of https://github.com/agperez/316
Fix Merge issues