Recolectar recursos tranki
Merge branch 'master' of github.com:IPV-1/TPFinal