Configured actionmailer for 3amtester@gmail.com
Merge remote-tracking branch 'origin/master'