prep for pull
Merge branch 'master' of github.com:0ax1/Infektsimulation

Conflicts:
	world.c
condition for drawing path