changed test2 in the testing branch
commit changes made in master branch
Merge branch 'testing'

Conflicts:
	test2.txt