aff

aff
Merge branch 'master' of https://github.com/Fokio/Computa--o-Orientada-a-Objeto-_-RPG

Conflicts:
	Projeto-RPG/src/view/Teste.java