commit de criacao do animais
Replace octopus with an octodog
Replace octodog
Replace octopus with an octodog
Replace octopus with an octoman
solved Merge branch 'octodog'

Conflicts:
	animals.txt
resolvido