commit local change to local repo after fetching conflict
GitTest.java
User.java
UserController.java
Merge remote-tracking branch 'origin/master'

Conflicts:
	Freemarker_SpringMVC/src/com/freemarker/User.java
	Freemarker_SpringMVC/src/com/freemarker/UserController.java