flujo normal 2
Merge branch 'NK'