game
Merge branch 'master' of https://github.com/ArcMurilo/java

Conflicts:
	.gitignore
	Batalha/nbproject/project.properties
	Batalha/src/classes/Batalha.java
	Batalha/src/classes/Personagem.java
	Batalha/src/imagens/batalha.png
Merge branch 'master' of https://github.com/ArcMurilo/java

Conflicts:
	.gitignore
	Batalha/nbproject/project.properties
	Batalha/src/classes/Batalha.java
	Batalha/src/classes/Personagem.java
	Batalha/src/imagens/batalha.png