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
Merge branch 'master' of https://github.com/WilliamRojas/PROYECTO into WilliamRojas-master

Conflicts:
	app/views/accidentes/_form.html.erb
Merge branch 'WilliamRojas-master'