Merge branch 'jiaqi-zheng'

Conflicts:
	src/vidtrack.py