fixed manqueada 3
Merge branch 'master' of https://github.com/sebastianamaro/proyectofinal