Contourmatching opencv

Merging this branch.