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

Conflicts:
	SystemY nameServer/ip-list.xml