Merge pull request #183 from jkuk/master

uploading calendar changes made by richard, and updating log in
Cleaned up constructor.  Ability to log out.
Merge remote-tracking branch 'upstream/master'
Readded Ketty's method.
Merge pull request #184 from WannabeSid/master

Cleaned up constructor. Ability to log out.