Questão 2
Merge branch 'master' of https://github.com/CFelipe/Lingmas

Conflicts:
	subprob_08/r_02.tex