listo cronograma
se coloco la letra del menu mas grande, se termino de aplicar cancancan a cronograma
a
b
c
c
d
Merge branch 'master' of https://github.com/WilliamRojas/PROYECTO

Conflicts:
	config/routes.rb
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
a
e
f