..
Merge branch 'gui'
..
Merge branch 'develop' of https://github.com/Alllex/Schedule into model
..
Bugfix: correct work of coflict 'LecturersInDifferentClassrooms'.
Add new conflict: lecturers on different classes.
Merge pull request #12 from Lozov-Petr/model

New conflict.
Merge branch 'exp'
Merge branch 'develop' of https://github.com/Alllex/Schedule.git
Refactoring conflicts fixed