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

Conflicts:
	src/be/uantwerpen/MulticastListener.java
	src/be/uantwerpen/NameServer.java
	src/be/uantwerpen/Test.java