Merge branches 'version3' and 'stuff' into version3
change lower tracking to calculate distance and bearing of object
Merge branches 'version3' and 'temporary11' into version3