解决矛盾。。。
Merge branch 'master' of https://github.com/HazelChen/healthClub

Conflicts:
	healthClub/WebContent/manager/club.jsp
	healthClub/WebContent/manager/clubInner.jsp