stuff
conflict

Conflicts:
	app/views/events/index.html.erb