commit 23
branch commit 22
branch commit 24
branch commit 25
Merge branch 'test' of https://github.com/mynkov/Test into test

Conflicts:
	1.txt