fixed merge conflicts
Added face feature extractor
Merge branch 'master' of https://github.com/katiecanada/cs221Project
opencv stuff
fixed merge conflict