tirando gambi felipe
Merge branch 'master' of http://github.com/saraivaufc/ListaDeCompras
Sobrescrevendo
Conflicts:
	SisCompra/SisCompra.pro.user
	SisCompra/mainwindow.cpp