ABCDEFG
Merge branch 'master' of https://github.com/HustedLeo/market-web.git

Conflicts:
	learngit/WebContent/index.jsp