changes on test1.txt version 2.0 with conflict which need to sorted out
Merge branch 'training1' of https://github.com/ithands/trainingbranch into training1

Conflicts:
	test1.txt