conflict
Merge branch 'master' of
https://github.com/KNIKPolitechnikaPoznanska/AtremProject.git

Conflicts:
	atrem/src/atrem/test.java