Gerando conflitos

No arquivo README
Merge branch 'master' of https://github.com/KallynnyKarlla/si1-lab1

Parte 1 conlfito
Conflicts:
	README.txt