Fixed flann code
Merge branch 'master' of github.com:doerrpau/eecs442proj