cleaned up code and separated kmeans from nearest neighbours
cleaned up code
fixed merge conflicts