Fixed some merge conflicts...
Merge branch 'master' of github.com:rop-productops/yolo-of-the-day