erro no github (conserto)
Merge remote-tracking branch 'origin/construção' into construção

Conflicts:
	RPG_Epico/build/classes/Principal/Principal.class
	RPG_Epico/build/classes/abstratas/Heroi.class
	RPG_Epico/build/classes/abstratas/Vilao.class
	RPG_Epico/build/classes/concretas/armas/ArcoEFlecha.class
	RPG_Epico/build/classes/concretas/armas/Espada.class
	RPG_Epico/build/classes/concretas/armas/Machado.class
	RPG_Epico/build/classes/concretas/personagens/Gnomo.class
	RPG_Epico/build/classes/concretas/personagens/Necromancer.class
	RPG_Epico/build/classes/concretas/personagens/Ogro.class
	RPG_Epico/nbproject/private/private.properties
	RPG_Epico/src/Principal/Principal.java
	RPG_Epico/src/abstratas/Heroi.java
	RPG_Epico/src/abstratas/Vilao.java
	RPG_Epico/src/concretas/armas/ArcoEFlecha.java
	RPG_Epico/src/concretas/armas/Espada.java
	RPG_Epico/src/concretas/armas/Machado.java
	RPG_Epico/src/concretas/personagens/Gnomo.java
	RPG_Epico/src/concretas/personagens/Necromancer.java
	RPG_Epico/src/concretas/personagens/Ogro.java