catalogos
borrados
cotizacion add

agregar a cotizacion
clientes

clientes ordenados primero muestra los clientes que son mios y luego los
disponible
botones eliminar
Merge remote-tracking branch 'origin/Diseño'

Conflicts:
	application/models/catalogosm/catalogosm.php
botones eliminar en los catalogos
Merge remote-tracking branch 'origin/master'

Conflicts:
	application/models/catalogosm/catalogosm.php
alguito
nose
Merge branch 'master' of https://github.com/byronpenna/radiostereo
Merge remote-tracking branch 'origin/InertarDatos'
boton delete

cambiamos el boton de eliminar xD jajajajajaa xD