config files
Merge branch 'master' of github.com:hky926/4SCarShop

Conflicts:
	.idea/workspace.xml
	4sCarShop.iml
	pom.xml
	src/main/java/com/carshop/bean/User.java
	target/classes/com/carshop/bean/User.class
	web/WEB-INF/web.xml
	web/index.jsp