Merge pull request #13 from nuvtec/master

Adicionada as disciplinas da turma
Merge pull request #18 from AbelAguiar/master

Merge pull request #13 from nuvtec/master