Subi lo de memoria
Merge branch 'master' of https://github.com/lmoscheni/SO