solucionando problema de salarios en modificar
Merge branch 'master' into cruz
Merge branch 'cruz'