cambios con error
Merge branch 'master' of https://github.com/doitmex/Lucha-de-palabras

Conflicts:
	LuchaPalabras/src/com/doit/luchapalabras/screens/GameScreen.java