* user can CRUD charges #5 #6
* setup authorization system with CanCan
* setup feature specs with Capybara
Merge branch 'charges'

Conflicts:
	app/controllers/events_controller.rb
	app/models/event.rb
	app/views/events/show.html.haml
	config/routes.rb
	db/schema.rb