Ant-scripting inicjalizacja
Merge branch 'master' of https://github.com/tim91/uczelnia

Conflicts:
	Calculator/target/classes/META-INF/maven/1/Calculator/pom.properties