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

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

Conflicts:
	bin/be/uantwerpen/MulticastListener.class