datos despacho

falta el modificar
Merge remote-tracking branch 'origin/master'

Conflicts:
	function/logincliente.php