Added keypoint tracking, started modifiying to fit into larger architecure
need to for merge conflict
Merge branch 'master' of https://github.com/Brooks-Willis/shoe_monster