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

Conflicts:
	1.txt
branch commit 26
branch commit 27
branch commit 28
commit 24
28