Removing accidental additions
Merge branch 'master' of https://github.com/lexingxie/cvfeatures