Commit 2
Commit 3. User 1.
Merge branch 'master' of https://github.com/AntonIvanov87/test

Conflicts:
	.gitignore
	pom.xml