Aanpassing Johan
Aanpassing Johan
Aanpassing Johan
Merge origin/master

Conflicts:
	AirHockey_Client2_Jeroen/nbproject/build-impl.xml
	AirHockey_Client2_Jeroen/nbproject/genfiles.properties
	AirHockey_Client2_Jeroen/nbproject/project.properties
	AirHockey_Client2_Jeroen/nbproject/project.xml
	AirHockey_Client2_Jeroen/src/gui/GameLobby.java