Teste
Resolvendo Conflitos e to indo para a Pascoa \o/

Conflicts:
	Smarket/src/br/com/smarket/model/Produto.java
	Smarket/src/br/com/smarket/view/Main.java