kmeans
modified kmeans methods
changed seed file
fixed conflicts