New code... too tired to elaborate
Fixed nn generation modules
Merge branch 'master' of https://github.com/eugeneyche/nearest_neighbor

Conflicts:
	cpp/src/main.cpp
Fixed merge bugs