Нука тож закоммичу :)
Merge branch 'master' of https://github.com/aistsoft/testRepo

Conflicts:
	oleg-file.txt