added txt5
text5 added branch2
text5 added branch1
Merge branches 'test_branch1' and 'test_branch2' in master

Conflicts:
	test.txt