Adding all changes
Merge branch 'master' of https://github.com/johnolos/yolo-bear