Merge pull request #1 from mayrav/master

hello
calendar
Merge pull request #2 from butwhy/master

calendar goodbye
add teachers