version 2.0 by developer 2
Merge branch 'training1' of https://github.com/ithands/trainingbranch into training1

Conflicts:
	test1.txt