Initial commit
Merge branch 'master' of http://github.com/EricleeCrystal/huoshi

Conflicts:
	.gitignore
	README.md
add spring web
Merge branch 'master' of https://github.com/EricleeCrystal/huoshi.git
Merge branch 'master' of https://github.com/EricleeCrystal/huoshi.git

Conflicts:
	src/main/webapp/WEB-INF/web.xml