teste
ignore
Merge branch 'master' of https://github.com/jabez/ProjetoFeanPOO2.git

Conflicts:
	.gitignore