Agrega tiempo
Merge branch 'master' of github.com:canalesb93/eavesdrop

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