Update Event Controller
- include item instance variable as this is rendering on event show page
- minor change to update action, no need for "@"
Fix merge conflicts
Add some basic controller tests
- Edit/update factories for events and users