Feature Creation appears to be done
Merge branch 'master' of github.com:dvillega/Adaboost-FaceDetection

Conflicts: