Cena de luta atualizada
Merge remote-tracking branch 'origin/master'

Conflicts:
	bin/View/States/LutaState.class
	bin/View/States/MapaState.class
	bin/View/States/Teste.class
	src/View/States/LutaState.java
	src/View/States/MapaState.java