cambios menores
Merge branch 'partida' of https://github.com/Stratego/Project-X into partida

Conflicts:
	main/src/com/example/libgdx/skeleton/SkeletonMain.java