a
Merge branch 'master' of https://github.com/david-zhou/SistemaDeFacturacionYCuentasPorCobrar

Conflicts:
	sfcpc/baseDeDatos.db