Implemented Action Mailer to generate email notifications
Resolved Conflicts and Implemented Action Mailer