felipe
aSASdasdsad

Merge branch 'master' of https://github.com/saraivaufc/ListaDeCompras

Conflicts:
	SisCompra.pro.user
	controladordosistema.cpp
	controladordosistema.h
	mainwindow.cpp