defectos\defecto.txt
Merge branch 'Branch'

Conflicts:
	defectos/defecto.txt