Merge branch 'master' of https://code.microneil.com/madscientist/SNFMulti

 Conflicts:
	snfLOGmgr.hpp

snfLOGmgr.hpp

@@ -18,6 +18,7 @@
 #include <ctime>
 #include <cstdio>
 
+<<<<<<< HEAD
 #include "../CodeDweller/timing.hpp"
 
 #ifdef WIN32
@@ -30,12 +31,18 @@
 #include "../CodeDweller/threading.hpp"
 #include "../CodeDweller/histogram.hpp"
 
+=======
+>>>>>>> 5ef1aae226f36c766ca1253592a8c11d95dd1992
 #include "snf_match.h"
 
 #include "snfCFGmgr.hpp"
 #include "snfNETmgr.hpp"
 #include "GBUdb.hpp"
 
+#include "../CodeDweller/timing.hpp"
+#include "../CodeDweller/threading.hpp"
+#include "../CodeDweller/histogram.hpp"
+
 namespace cd = codedweller;
 
 class snfNETmgr;                                                                // Declare snfNETmgr

snf_sync.hpp

@@ -10,9 +10,9 @@
 
 #include <list>
 #include <cstring>
-#include "GBUdb.hpp"
 #include "../CodeDweller/networking.hpp"
 #include "../CodeDweller/configuration.hpp"
+#include "GBUdb.hpp"
 
 namespace cd = codedweller;