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

Conflicts:
	atrem/src/executableRMIclases/Server.java