Merge pull request #110 from johnkabler/master

clean up
finally pushing my updated KNN implentation
Merge pull request #111 from lauralorenz/master

finally pushing my updated KNN implentation
about to start cleanup
fixed lm
fixing merge conflict