updated file
Merge branch 'training2' of https://github.com/ithands/trainingbranch into training2

Conflicts:
	test2.txt
	test3.txt