mailer functionality
Merge remote-tracking branch 'upstream/master'
conflicts resolved
Merge pull request #11 from archanachandran/master

mailer functionality