#4
#7
Merge branch 'iss53'

Conflicts:
	gitTeste/src/gitTeste/Pessoa.java