hola
Merge branch 'master' of https://github.com/CAECE-LP/LeagueGame

Conflicts:
	src/com/game/MainGame.java
	src/com/game/Pelea.java
	src/com/game/Personaje.java