Ivashkin-change
Отредактировал фаил
Ivshin set text
JohnKuper
Merge branch 'JohnKuper' into shutov_branch
Merge branch 'd3m-branch' into shutov_branch

Conflicts:
	myEpamRep/Matriculant/homework.txt
Merge branch 'igorTree' into shutov_branch

Conflicts:
	myEpamRep/Matriculant/homework.txt
Merge branch 'ivshin' into shutov_branch, end of merging

Conflicts:
	myEpamRep/Matriculant/homework.txt