asd
	modified:   sfcpc/sfcpc/plantillas/Clientes.html
	modified:   sfcpc/sfcpc/plantillas/Clientes_Cambio.html
	modified:   sfcpc/sfcpc/urls.py
Bajas
Merge branch 'master' of https://github.com/david-zhou/SistemaDeFacturacionYCuentasPorCobrar

Conflicts:
	sfcpc/baseDeDatos.db

	modified:   sfcpc/principal/forms.py