Merge branch 'master' of github.com:AlexeyAB/darknet

AlexeyAB

2017-12-28 83d9b0b6d81755ce3f7b856b56a485b0abb34f81

 src/demo.c

@@ -125,7 +125,7 @@
    demo_classes = classes;
    demo_thresh = thresh;
    printf("Demo\n");
    net = parse_network_cfg(cfgfile);
    net = parse_network_cfg_custom(cfgfile, 1);
    if(weightfile){
        load_weights(&net, weightfile);
    }