.
Merge branch 'master' of https://github.com/bauminator90/ComputerVision

Conflicts:
	RigidPointSet.m