Arreglada ordenacion
Arreglada ordenacion
Revert "Arreglada ordenacion"

This reverts commit 4ebedc84126ecbeeb4b9bd71a406ad3d2b32226e.
Arreglada ordenacion
Revert "Arreglada ordenacion"

This reverts commit d0441e460dedaebf3c8487c9090c048b7dccf99f.
Merge remote-tracking branch 'origin/PruebasLorenzo'

Conflicts:
	EAC5/src/ioc/eac5/gestor/GestorDeDatos.java
Merge remote-tracking branch 'origin/PruebasLorenzo'

Conflicts:
	EAC5/src/ioc/eac5/gestor/GestorDeDatos.java
Merge commit 'daed667139afcc7451e2d8d43443aa7432383a2e'

Conflicts:
	EAC5/src/ioc/eac5/gestor/GestorDeDatos.java