Tentativa de conflito
Merge branch 'master' of https://github.com/castelom/metodos