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

LICENSE

                                   YOLO LICENSE
-                             Version 1, July 10 2015
+                             Version 2, July 29 2016
 
 THIS SOFTWARE LICENSE IS PROVIDED "ALL CAPS" SO THAT YOU KNOW IT IS SUPER
 SERIOUS AND YOU DON'T MESS AROUND WITH COPYRIGHT LAW BECAUSE YOU WILL GET IN
 TROUBLE HERE ARE SOME OTHER BUZZWORDS COMMONLY IN THESE THINGS WARRANTIES
-LIABILITY CONTRACT TORT LIABLE CLAIMS RESTRICTION MERCHANTABILITY SUBJECT TO
-THE FOLLOWING CONDITIONS:
-
-1. #yolo
-2. #swag
-3. #blazeit
+LIABILITY CONTRACT TORT LIABLE CLAIMS RESTRICTION MERCHANTABILITY. NOW HERE'S
+THE REAL LICENSE:
 
+0. Darknet is public domain.
+1. Do whatever you want with it.
+2. Stop emailing me about it!