Email Stuff
merge
Merge branch 'master' of https://github.com/CAH-JeffreyNorder/hackathon

 email stuff