changed content of testbranch.txt
changed testbranch.txt
Merge branch 'testing1'

Conflicts:
	testbranch.txt
changed testbranch.txt