correccion bug al ejecutar ia
Merge branch 'partida' of https://github.com/Stratego/Project-X into partida

Conflicts:
	main/src/com/rugbysurvive/partida/Simulador/Simulador.java
	main/src/com/rugbysurvive/partida/tablero/Campo.java