Clone 1'
Merge branch 'master' of https://github.com/stenioaraujo/si1-lab1

Conflicts:
	README.txt - Ficando com ambos, 1 e 2