Updated ball-tracking
Merged Vipul's code
Fixed a git merge error