desde portatil
Merge branch 'master' of https://github.com/isako44/nuevotitanic