commit
Merge branch 'master' of https://github.com/thebkbuffalo/travel_breakdown_app

Conflicts:
	app/controllers/events_controller.rb
Merge branch 'master' of https://github.com/thebkbuffalo/travel_breakdown_app
events controller
Merge branch 'master' of https://github.com/thebkbuffalo/travel_breakdown_app