jar-pom
Merge branch 'master' of https://github.com/cjjlovecjj/jar-pom

Conflicts:
	pom.xml