from magna
Merge branch 'master' of https://github.com/AlexSilvaGomes/EstudoCertification.git
after merge
Merge branch 'master' of
https://github.com/AlexSilvaGomes/EstudoCertification.git

Conflicts:
	EstudoCertification/AnswersText.txt
	EstudoCertification/Notes.txt
	EstudoCertification/examLab hints.txt
	EstudoCertification/src/test/AuxTest.java