Merge remote-tracking branch 'origin/master'

Conflicts:
	bin/be/uantwerpen/Client.class
	json/local.json
	json/replicated.json
	src/be/uantwerpen/Client.java
fixes
Merge branch 'master' of https://github.com/bartmoons/gedistribueerdesystemen

Conflicts:
	bin/be/uantwerpen/Client.class
	bin/be/uantwerpen/MulticastListener.class
	json/local.json
	json/replicated.json
	src/be/uantwerpen/Client.java
Merge branch 'master' of https://github.com/bartmoons/gedistribueerdesystemen

Conflicts:
	bin/be/uantwerpen/MulticastListener.class
Merge branch 'master' of https://github.com/bartmoons/gedistribueerdesystemen

Conflicts:
	bin/be/uantwerpen/Client.class
	json/local.json
	src/be/uantwerpen/Client.java