added things
Merge branch 'master' of github.com:Scuzzball/GrandMail