commit testting
Signed-off-by: hengguo <abcd19921007@163.com>
tt
Merge branch 'master' of github.com:hengguo/javaee_springmvc_maven

Conflicts:
	Readme.txt
	src/main/resources/spring/redis-context.xml
	src/main/resources/spring/spring-config.xml
	src/main/resources/spring/spring-servlet.xml