pull
arreglo cronograma
Merge https://github.com/morenopalacios/PROYECTO

Conflicts:
	app/views/cronogramas/index.html.erb
cambios crono
Merge https://github.com/morenopalacios/PROYECTO
cronograma calender
calender
calender
estadistica
merg
Merge branch 'master' of https://github.com/lindalizeth/PROYECTO

Conflicts:
	app/assets/stylesheets/scaffolds.css.scss