Jakis tekst - new branch
Merge branch 'newbranch'

Conflicts:
	test.txt