Some fix2

Signed-off-by: AlexeyAB <kikots@mail.ru>
3

Signed-off-by: AlexeyAB <kikots@mail.ru>
Merge branch 'master' of github.com:AlexeyAB/TestRep

Conflicts:
	test.txt