finir cpp
Merge branch 'master' of https://github.com/johnrazeur/yolo