Changed nndes model to add Point class that holds both the global oracle index and local KNN index of each point
Fixing merge conflicts