Changed default action mailer
added mail gem and pushed to heroku
Sending email works
commit before pull
fixed merge conflict
totally working and was able to send mail from the command line