uploading calendar changes that richard made, updated log in to handle duplicate email exceptions
Merge pull request #183 from jkuk/master

uploading calendar changes made by richard, and updating log in
Merge remote-tracking branch 'upstream/master'
Readded Ketty's method.