Merge
Merge branch 'master' of github.com:Linowzin/trabalhoED2
Metodo de alocacao