Merge branch 'juste'
Merge branch 'juste' into christoph's-branch
Merge branch 'christoph's-branch' into juste
WORKING SETUP
Leaving the Universtity's commit (go still doesn't work)
Merge branch 'master' into juste
test go
Merge remote-tracking branch 'origin/juste' into christoph

Conflicts:
	Models/load-network.nlogo.bak
	Models/load-network.nls
merged juste -> chrisotph