subindo, por último, o clone2.
Merge branch 'master' of https://github.com/GustavoYamaguchi/si1-lab1

Conflicts:
	README.txt