committing
Merge branch 'master' of https://github.com/victorleal/javalab

Conflicts:
	bin/core/Endereco.class
	bin/core/Transportadora.class