Mais alteração
Merge branch 'master' of
https://Rlvcesar@github.com/npi-ufc-qxd/projeto-teste.git into f3

Conflicts:
	arq1.txt
Merge pull request #9 from npi-ufc-qxd/f3

F3