include backbone-parse, location collection & model
conflict
Merge branch 'master' of github.com:psyburn/yolo-bear