segunda modificacao
Merge branch 'master' of https://github.com/IsraeLucena/si1-lab1

Conflicts:
	README.txt
merged resolved