branch1 muudatus
Merge branch 'branch0'

Conflicts:
	test.txt