kon
Merge branch 'Pawel&Wojciech2' of
https://github.com/KNIKPolitechnikaPoznanska/AtremProject.git into
Pawel&Wojciech2

Conflicts:
	atrem/src/rmi/RemotePlayerControllerImp.java