Changes for file from testbranch2
Commit 3 files on testbranch2:

Conflicts:
	file_testbranch.txt