RMI add player to game
Merge remote-tracking branch 'origin/master'

Conflicts:
	TestProjectAirhockey/src/Lobby/RMI_Server.java