commit jquery demo
Merge branch 'master' of https://github.com/careyyoung/practice1.git

Conflicts:
	pom.xml