edited test file on test branch

Conflicts:
	test.txt