ok
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/main/java/com/springapp/mvc/HelloController.java
ok
Merge remote-tracking branch 'origin/master'

Conflicts:
	.idea/workspace.xml
	src/main/java/com/springapp/mvc/HelloController.java