added new.txt and modified test.txt
Merge remote-tracking branch 'origin'

Conflicts:
	test.txt