teste
Merge branch 'master' of https://github.com/rafa210587/JogoRpg.git
Merge branch 'master' of https://github.com/rafa210587/JogoRpg.git

Conflicts:
	JogoRpg/src/panels/PanelNvoJgo.java