Последняя версия
Merge branch 'master' of github.com:kirilovskikh/JavaSpringServer

Conflicts:
	untitled/.idea/workspace.xml
	untitled/target/SpringMVCApp.war