mailer mostly working
Merge branch 'master' into homework
pushing to master
Merge pull request #16 from Noahhh/homework

Homework