test branch son
Update WebContent/index.jsp

son
Merge branch 'master' of https://github.com/JerryShi/JQuery-Study.git

Conflicts:
	WebContent/index.jsp