Added update method, comments, and deleting events
small edit to htmls
resolved conflicts