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

AlexeyAB

2017-12-28 83d9b0b6d81755ce3f7b856b56a485b0abb34f81

 src/yolo_v2_class.cpp

@@ -54,7 +54,7 @@
   char *cfgfile = const_cast<char *>(cfg_filename.data());
   char *weightfile = const_cast<char *>(weight_filename.data());

   net = parse_network_cfg(cfgfile);
   net = parse_network_cfg_custom(cfgfile, 1);
   if (weightfile) {
      load_weights(&net, weightfile);
   }