1
Merge branch 'master' of https://github.com/lmrozek/project01.git

Conflicts:
	src/main/java/pl/altkom/controller/MailController.java