Mis cambios con ejecutable

Excepto lib
Merge remote-tracking branch 'origin/master' into Betmart
Merge branch 'Betmart' of https://github.com/bet1aguilar/Despacho into Betmart