que vamos a realizar
fix merge

Merge branch 'master' of https://github.com/dioh/animal

Conflicts:
	Animal/informe/preeliminar.md