smile
Merge remote-tracking branch 'origin/master'

Conflicts:
	Dmitriy.txt
Merge remote-tracking branch 'origin'

Conflicts:
	Dmitriy.txt