added bells and whistles
Merge branch 'master' of github.com:silverdev/cs199

Conflicts:
	hw3/crimes.R
bugfix and more knn