Client
Merge branch 'master' of https://github.com/bartmoons/gedistribueerdesystemen

Conflicts:
	bin/gedistribueerdesystemen/Client.class