Commit para dar um pull
Merge branch 'master' of https://github.com/rafadalibera/mc011_projeto2

Conflicts:
	bin/.gitignore
Merge branch 'master' of https://github.com/rafadalibera/mc011_projeto2
commit
Merge branch 'master' of https://github.com/rafadalibera/mc011_projeto2 into heranca