made changes to test.txt
made changes in master branch
Merge branch 'testing'

Conflicts:
	test.txt