Some extra conflic resolution. Renamed some variables and some view usage
Merge branch 'master' of github.com:rop-productops/yolo-of-the-day