modification
Merge branch 'master' of https://github.com/David-TLS/ClientXSL

Conflicts:
	test.txt