Client
Merge remote-tracking branch 'origin/master'

Conflicts:
	bin/gedistribueerdesystemen/Client.class
	src/gedistribueerdesystemen/Client.java