Merge pull request #2 from giokats/master

Syncing the reporistories
Adding a calendar #5
Fixing the bug in the exit #3
Changing the name of the buttons and fixing #2
Merge pull request #10 from anagno/master

Fixing bug #2 and #3