conf
Merge branch 'master' of https://github.com/tom--bo/training2

Conflicts:
	test1.txt