chat rmi weggehaald
Merge branch 'master' of https://github.com/S33C-PTS3/PTS3

Conflicts:
	TestProjectAirhockey/src/testprojectairhockey/LobbyController.java
Merge branch 'master' of https://github.com/S33C-PTS3/PTS3