estadistica static
Merge https://github.com/morenopalacios/PROYECTO

Conflicts:
	app/assets/stylesheets/scaffolds.css.scss
	app/views/layouts/_navigation_links.html.erb
	db/schema.rb
cambios
cambios en estadistica.css, scaffold, staticspages
Merge https://github.com/morenopalacios/PROYECTO
crono-datepicker
Merge https://github.com/morenopalacios/PROYECTO

Conflicts:
	app/assets/stylesheets/scaffolds.css.scss
	db/schema.rb
modificado tipo_salida y accidentes-estadistica
arreglo en accidente
cambios novedades
cambio novedades
cambios estadistica
Merge https://github.com/morenopalacios/PROYECTO

Conflicts:
	app/assets/stylesheets/scaffolds.css.scss
	app/views/static_pages/help.html.erb
	db/schema.rb
cambio estadisticas2
vista estadistica
arreglo estadistica, migraciones novedades
cambios en novedad
Merge https://github.com/morenopalacios/PROYECTO

Conflicts:
	app/assets/stylesheets/scaffolds.css.scss
	app/views/riesgos/_form.html.erb
	app/views/static_pages/help.html.erb
pull
cambios cronograma