back to stable ...screwed sth
Merge branch 'master' of github.com:0ax1/Infektsimulation_Parallel

Conflicts:
	world.c