jasper changes
added function to make robot stop when confronted with object a meter or less away. need to finish function
fixed conflict
merge conflict fixed
code needed some previously unassigned functions to work
added to approach_shoe function. still untested
pushing changes for amander
Messing with things but want Jaspers changes
Merge branch 'master' of https://github.com/AmandaSutherland/ShoeStalker
Merge branch 'master' of github.com:AmandaSutherland/ShoeStalker
commiting because git
Merge branch 'master' of github.com:AmandaSutherland/ShoeStalker
apparently not up to date?
Merge branch 'master' of https://github.com/AmandaSutherland/ShoeStalker

Conflicts:
	ShoeStalker.py
changed Shoestalker_test_capture to new code to test for keypoint issues
changed Shoestalker_test_capture to new code to test for keypoint issues
OH MY GOD HOLY SHIT IT TRACKS THINGS LIKE CUPS
Merge branch 'master' of https://github.com/AmandaSutherland/ShoeStalker