asdasd

asdasd
Revert "zaraza"

This reverts commit b9129b04793ef442505b36d86758523c402896aa.

Conflicts:
	Posicion.java
Revert "Revert "zaraza""

This reverts commit e22317fc866fa1bb536008da88e8c4a646cdda24.