updated by developer 2 version 2.0 with conflict
Merge branch 'master' of https://github.com/ithands/training

Conflicts:
	test2.txt