agregando lineas
platforms
fix merge
agrego todas las lineas
Merge branch 'master' of https://github.com/Urucas/cuandollega