Merge pull request #7 from shanemiller500/master

Merge pull request #6 from shanemiller500/automailer
Merge pull request #8 from shanemiller500/automailer

Merge pull request #7 from shanemiller500/master