Отредактировал фаил
Merge branch 'igorTree' into ivshin

Conflicts:
	myEpamRep/Matriculant/homework.txt