Update test.txt
Merge branch 'Test2'

Conflicts:
	test.txt