Merge pull request #79 from aglos/Liorbs

Liorbs
Merge branch 'master' of https://github.com/aglos/A-Smart-Lecturer into avshalom
Merge pull request #78 from aglos/avshalom

Avshalom
Merge branch 'master' of https://github.com/aglos/A-Smart-Lecturer into
avshalom