Corrigindo erros e refatorando código
Merge branch 'sprint4' of https://github.com/ThabataG/APB into sprint4