test
Merge branch 'master' of https://github.com/kangtae49/spring_test.git

Conflicts:
	TestSpring/src/main/java/com/kkt/www/HomeController.java
	TestSpring/src/main/java/com/kkt/www/TestController1.java