xmlParser final update
Merge remote-tracking branch 'origin/master'

Conflicts:
	SystemY nameServer/ip-list.xml
Merge branch 'master' of https://github.com/kennardv/DSGroep-3

Conflicts:
	SystemY nameServer/ip-list.xml