Merge branch 'master' of pjreddie.com:jnet

Joseph Redmon

2015-06-10 a4485b8a6656c2a2fa0b78ca7c035523c8149b8c

 src/imagenet.c

@@ -32,7 +32,7 @@
        pthread_join(load_thread, 0);
        train = buffer;

/*
        /*
        image im = float_to_image(256, 256, 3, train.X.vals[114]);
        show_image(im, "training");
        cvWaitKey(0);