konflikty
Merge branch 'batryk' of
https://github.com/KNIKPolitechnikaPoznanska/AtremProject.git into
batryk

Conflicts:
	atrem/src/testy/game/remote/Player1.java