scaffold accidente
Aja
corrigiendo errores despues del push
modificando accidente
deleted:    db/migrate/20140827135357_add_testigo1_to_accidente
Merge branch 'master' of https://github.com/WilliamRojas/PROYECTO

Conflicts:
	app/assets/stylesheets/scaffolds.css.scss
	config/routes.rb
	db/schema.rb