mytest
Merge https://github.com/ericlee83/hello_world

Conflicts:
	src/main/java/com/codejava/springmvc/TestController.java
	
	remove test local