upraveny pom.xml a gitignore
Merge branch 'master' of github.com:poulDeTcheque/Library

Conflicts:
	pom.xml