Don't know what I'm commiting
Merge branch 'master' of https://github.com/johnolos/yolo-bear