Modification2
Merge branch 'master' of https://github.com/leticiamaia/si1-lab1

Conflicts:
	README.md