Creating an events controller
Merge branch 'master' into Events_Controller
merge conflict
Merge branch 'master' into Events_Controller
Creating a Events Controllers
more changes for events controller
magic
merge what?
Merge pull request #6 from mattyice50/Events_Controller

Events controller