merge
implemented generalized circle feature matching in preparation for trying stuff that needs quadruple matches
quad matching works and basic linear no-ransac 3dof translation tracking implemented, works badly