practicing merge conflicts
practicing merge conflicts

Conflicts:
	event_reporter.rb