typo fix
Merge branch 'hady'
mark menu calendar finished
Merge branch 'master' of https://github.com/gormed/drunken-nemesis