Adição de linhas.
Merge branch 'master' of https://Rlvcesar@github.com/npi-ufc-qxd/projeto-teste.git into f2
Mais alterações.
Merge branch 'master' of
https://Rlvcesar@github.com/npi-ufc-qxd/projeto-teste.git into f2

Conflicts:
	arq1.txt
Merge pull request #8 from npi-ufc-qxd/f2

F2