arreglado bug
combinacion
Merge branch 'master' of https://github.com/cernadasjuan/TGC.git
Merge branch 'master' of https://github.com/cernadasjuan/TGC.git