Added distance & angle function
Merge remote-tracking branch 'origin/master' into weeyou

Conflicts:
	output.txt
	src/tracker/Tracker.java
	targetMotionHistory.txt
	trackerMotionHistory.txt