changes for fix
Merge remote-tracking branch 'origin/lab4_dev'

Conflicts:
	lab4/scripts/pathNode.py