Rework
Merge branch 'master' of https://github.com/TheMSB/P2EO
der
Merge branch 'master' of https://github.com/TheMSB/P2EO

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