minor fixes
guy rework (yet again)
Merge branch 'master' of https://github.com/TheMSB/P2EO

Conflicts:
	P2_EINDOPDRACHT/src/game/Game.java
ConnectionWindow Update
Merge remote-tracking branch 'origin/Derk'

Conflicts:
	P2_EINDOPDRACHT/src/client/Client.java
	P2_EINDOPDRACHT/src/client/ClientGUI.java
tiny update
Merge branch 'master' of https://github.com/TheMSB/P2EO
Recommit ConnectionWindow