b3
Merge branch 'test-branch' of https://github.com/atoato/test-repository into test-branch

Conflicts:
	folder1/text1.txt