ras
Merge branch 'master' of github.com:H4313/xmltool

Conflicts:
	main.cpp
ras
Merge branch 'master' of github.com:H4313/xmltool

Conflicts:
	xmltool.exe