controlador unificado
Merge branch 'master' of https://github.com/ibaiosa5/Trucker
controlador unificado