Merge branch 'master' of https://github.com/mpo-csss/beedza

Conflicts:
	Source/main.nlogo

Source/main.nlogo

@@ -247,7 +247,7 @@ season-uncertainty
 season-uncertainty
 0
 20
-20
+4.9
 0.1
 1
 NIL
@@ -262,7 +262,7 @@ d-max
 d-max
 0
 30
-30
+12
 1
 1
 NIL

Source/vmodel.nls

@@ -16,6 +16,7 @@ to setup-spots
 end
 
 to setup-beekeepers
+  let temp 1
   file-open "beekeepers-initial-location.txt"
   while [not file-at-end?]
   [
@@ -25,7 +26,8 @@ to setup-beekeepers
     [ set shape "person"
       set size 1
       move-to one-of centroids-on patches with [ county-name = location-bk ]
-    if trace-on [ set color red pd ] ]
+    if trace-on [ set color temp pd ] ]
+    set temp temp + 3
   ]
   file-close
 end