More mail stuff
Merge branch 'master' of github.com:Fchaubard/CS108FinalProject