version 4.0
Merge branch 'master' of https://github.com/ithands/training

Conflicts:
	test1.txt