start e-mail finished
Merge branch 'master' of https://github.com/alfredolopez-kantox/rmt

Conflicts:
	lib/mail.rb