Merge remote-tracking branch 'origin/master'

Conflicts:
	Code/Tracking.c
	Code/newmain.c