no message
Merge branch 'master' of https://github.com/kennardv/DSGroep-3

Conflicts:
	SystemY nameServer/src/be/uantwerpen/server/NameServer.java
Updated gitignore