C
Merge branch 'master' of https://github.com/denisdolgikh/testRep

Conflicts:
	file.txt