c
r
Merge remote-tracking branch 'origin/issue2'

Conflicts:
	teste2/src/teste2/Pessoa.java