Merge pull request #12 from lindalizeth/master

estadistica, references incidente, enfermedad
cambios de riesgos y funcionarios
Inicio del tabs en accidente
Merge branch 'master' of https://github.com/WilliamRojas/PROYECTO into WilliamRojas-master

Conflicts:
	app/assets/stylesheets/scaffolds.css.scss
merg
tabs listo en accidente
modificacion de noticiias
modificacion de noticias
Merge branch 'master' of https://github.com/WilliamRojas/PROYECTO into WilliamRojas-master

Conflicts:
	app/views/accidentes/_form.html.erb
Merge branch 'WilliamRojas-master'
ajustes de accidente
Merge pull request #14 from WilliamRojas/master

ajustes de accidente
Merge pull request #15 from lindalizeth/master

descarga-Novedades
merg
Merge branch 'master' of https://github.com/morenopalacios/PROYECTO

Conflicts:
	public/system/albums/images/000/000/003/medium/4.png
	public/system/albums/images/000/000/003/thumb/4.png
modificacion de use
pull