ver
Merge branch 'master' of https://github.com/yaroslav-gorbenko/labs

Conflicts:
	pom.xml
1
Merge branch 'master' of https://github.com/yaroslav-gorbenko/labs