working on phase2 distance_field
Merge remote-tracking branch 'origin/master'

Conflicts:
	poc_zombie_template.py
working on phase2 distance_field