Lecture rooms
Merge branch 'master'