Imagem conflito diff.
Merge branch 'master' of https://github.com/DianaMarcela/si1