uploading calendar changes made by richard, and updating log in

log in can now handle duplicate email exceptions