subiendo ultimos cambios
Merge branch 'agregando_compañias' into admin_salitas
Merge branch 'admin_salitas' of github.com:juanito16/sistema_control_salitas_v1 into agregando_compañias