Alteração no README.txt
Merge branch 'master' of github.com:ffosilva/si1

Conflicts:
	lab1/README.txt