:q
Merge branch 'master' of https://github.com/novoalg/cs485-1

:q
Finished mailer model and mass email feature