hola git hub , ya sabes!!
Merge remote-tracking branch 'origin/master'

Conflicts:
	application/views/modulo_consulta_clientes.php