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

Conflicts:
	build-SisCompra-Desktop_Qt_5_3_GCC_32bit-Debug/Makefile