listo cronograma
cambio
Merge https://github.com/morenopalacios/PROYECTO

Conflicts:
	app/views/events/show.html.erb
pull
cambio css
Merge pull request #21 from lindalizeth/master

otro cambio