.
Merge branch 'master' of github.com:smo93/MailList

Conflicts:
	mail.py