Matching basically functional
Merge branch 'master' of github.com:TheDuckCow/jigSolver

Conflicts:
	jigSolver/JSVOpenCVSIFT.mm
	jigSolver/ViewController.mm