Added changes to Events
Merge branch 'jonathan' of https://github.com/jonathanrelf/WatchOut into jonathan
Got the Calendar to create an event
Fixed merge conflicts