added start and end times to events as well as discount
merge conflict fixed