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

Conflicts:
	bin/core/Loja.class