work
Merge branch 'master' of https://github.com/ebizR4Team2/task15

Conflicts:
	Task 15/src/parser/Xml.java