Editando pelo clone2
Merge branch 'master' of github.com:rafaelclp/si1

Conflicts:
	lab1/README.txt
Testing