prueba
prueba
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/controllers/calendar_controller.rb
	app/views/calendar/index.html.erb