Dag jean
Merge branch 'master' of github.com:bartmoons/gedistribueerdesystemen

Conflicts:
	bin/be/uantwerpen/Client.class
	hashmap.properties
	json/local.json
	json/replicated.json