juanca controller agregado para hacer test de como funcionan los branchs
controlador de prueba nelson
Merge branch 'feature/sofy' into feature/juanca
Merge branch 'feature/Nelson' into feature/juanca
Merge branch 'feature/sofy' into feature/Nelson
Merge branch 'feature/juanca' into feature/Nelson
Merge branch 'feature/Nelson' into feature/sofy