Merge branch 'master' of heroku.com:test-emailr

Conflicts:
	mail_sender.rb