fixed merged conflicts
adding mailer stuff and deleting some stuff not useful
added stuff
added mailer start stuff and also fixed view in new.html.erb to show the current_user contacts
git status
merging in josh's changes
Merge pull request #10 from jadeapplegate/mailer

Mailer