for Jasper
Merge branch 'master' of github.com:AmandaSutherland/ShoeStalker
Things work? At least parts do. We need to combine to hopefully fix our individtual errors
COMBINATION TIME
Merge branch 'master' of https://github.com/AmandaSutherland/ShoeStalker
HOLY SHIT STUFF WORKS OH MY GOD NOW JUST FIX TRACKING
Last minute changes. Trying to fix something in finding keypoints which could be why the tracking isn't working.