Учителя могут работать
Соединены ветки.
Merge branch 'master' of https://github.com/dimavt/IT-University

Conflicts:
	cmp/Lesson/Lesson.php
	cmp/Lesson/vw/view.php
Merge branch 'master' of https://github.com/dimavt/IT-University