Arquivo gerado para dar conflito
Conflito resolvido
Merge branch 'master' of https://github.com/andrezaraquel/si1-lab1