made email stuff
Merge pull request #1 from davidhariri/mikes-awesome-branch

made email stuff