Working on ObjectoCompuesto3D
Resolved conflicts