igualei
coloquei as imagens dos conflitos
Merge branch 'master' of https://github.com/LeticiaLBarbosa/si1.git