李淏test
李淏test2
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/main/webapp/index.jsp
Merge branch 'master' of https://github.com/bennyjiao/iwisdom.git
Merge branch 'master' of https://github.com/bennyjiao/iwisdom.git
Merge remote-tracking branch 'origin/master'