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