Class Movimiento
Merge branch 'master' of https://github.com/nroje/Pr2

Conflicts:
	src/tp/pr2/logica/Movimiento.java
	src/tp/pr2/logica/ReglasJuego.java