[SGRAI] - Resolução de conflitos
Autor: 1100655
Merge branch 'master' of https://github.com/1101516DanielBento/Think-Code