sdfsd
Merge branch 'master' of https://github.com/Ondrashx/testrepo
sdfsdwq
fsd
Merge branch 'master' of https://github.com/Ondrashx/testrepo

Conflicts:
	a.txt