...
osc config
fix
multiple predators, ...
...
inidiviaul contributions
Merge branch 'master' of ssh://github.com/fred1234/ethz-gess-what

Conflicts:
	doc/tex-files/description_of_the_model.tex