Aprendendo merge
Merge branch 'master' of https://github.com/stenioaraujo/si1-lab1

Conflicts:
	README.txt