added mailer part 1
Merge branch 'master' of github.com:emilysimonton/super_secret into mailer
added recipients, users
added recipient
fixed merge conflict