wat todos opgelost, bugfixes smart ai
Merge remote-tracking branch 'origin/Derk'

Conflicts:
	P2_EINDOPDRACHT/src/client/Client.java
	P2_EINDOPDRACHT/src/client/ClientGUI.java