增加方法
Merge remote-tracking branch 'origin/master'

Conflicts:
	WebContent/WEB-INF/web.xml
45%
Merge branch 'master' of https://github.com/cecj06googo/Googo

Conflicts:
	WebContent/WEB-INF/web.xml