Добавили отчет
Merge remote-tracking branch 'origin/master'

Conflicts:
	.idea/artifacts/KazG_war_exploded.xml
	.idea/workspace.xml
	KazG.iml
	src/main/java/org/springframework/controller/MainController.java
	src/main/java/org/springframework/dao/UsersDAOImpl.java
	src/main/java/org/springframework/model/UsersEntity.java
	src/main/java/org/springframework/service/MainServiceImpl.java
	src/main/resources/config/jasper-views.xml
	src/main/webapp/WEB-INF/templates/user.html
Добавили отчет