Changes to fix mailer
Merge branch 'master' of https://github.com/katdrobnjakovic/pet_adoption