frmUnificacion

Falta terminarla
Merge branch 'master' of https://github.com/jonavargas/Project
Merge remote-tracking branch 'origin/Jona'
Detalle
Merge remote-tracking branch 'origin/Jona'
Merge branch 'master' of https://github.com/jonavargas/Project
frmUnificacion

Listo falta preg a mainor
frmUnificacion en grande
Merge remote-tracking branch 'origin/Jona'
Merge remote-tracking branch 'origin/Ericka'