added test3.txt
modified test3.txt
test zum mergen
Merge branch 'testbranch' after conflict

Conflicts:
	test3.txt