added ability to modify calendar events
result of merged
cleaned result of merge
commit merge
commite merge
commit merge
Merge branch 'master' of https://github.com/dbigelow25/scaha