#16 work
Correction of some bugs
Merge remote-tracking branch 'origin/master'

Conflicts:
	README.md
	src/zuul/room/LectureRoom.java