multicasterServer
Merge remote-tracking branch 'origin/master'

Conflicts:
	bin/be/uantwerpen/MulticastListener.class
	src/be/uantwerpen/MulticastClient.java
	src/be/uantwerpen/clientInterface.java