Merge branch 'master' of heroku.com:hd4sq
adding to mailer
Merge branch 'master' of github.com:harlie/hd4sq