Added email functionality
Merge branch 'master' of https://github.com/jesserosato/BackEnd into merge