first_commit
Merge branch 'master' of https://github.com/ThatisOK/MailProject

Conflicts:
	MailProject