ignore target
maven so far
Merge remote branch 'origin/master'
Merge remote branch 'origin/maven'

Conflicts:
	.classpath
	deploy.sh
	pom.xml
	readme.md
Merge remote branch 'refs/remotes/origin/master'

Conflicts:
	readme.md