cambios
Merge branch 'master' of https://github.com/jibanezg/EscaleraFX

Conflicts:

	target/classes/META-INF/maven/JuegoEscaleraFX/JuegoEscaleraFX/pom.properties