merge changes

Tino Hager

2018-06-27 ab5368e2795c3340aa8d7a12f973773572ceb28a

1
2
3
 
 
./darknet detector demo ./cfg/coco.data ./cfg/yolov2.cfg ./yolov2.weights test50.mp4 -i 0 -thresh 0.25