t
Merge branch 'master' of https://github.com/itarasenko/test

Conflicts:
	test file.txt