cambios de css
Merge branch 'master' of https://github.com/morenopalacios/PROYECTO
Merge https://github.com/morenopalacios/PROYECTO

Conflicts:
	app/views/cronogramas/index.html.erb
cambios crono