Replaced old code. added mail functionality.
Merge branch 'master' of https://github.com/swathi-mn/Team15