changing the keypoint matcher to FLANN
fixed merge conflict