diff
Merge branch 'Correccion-de-movimiento' of https://github.com/jomscl/CP1-1 into Correccion-de-movimiento

Conflicts:
	CP 1/CP 1.v11.suo