do a commit before adding in password and other details in my mailer configuration
included the config file to gitignore
moved the config file out
action mailer working now, changing email and password to environmental variable instead of hardcode
mailer with config but no email address or password
test to see if gitignore worked
set up environment variable
Merge branch 'steve'

finished mailer
merged conflict