Update vidtrack.py
Merge remote-tracking branch 'origin/haoyu's-branch' into hana's-branch2

Conflicts:
	src/vidtrack.py