Changes
changes
Merge branch 'feature/AlgorithmSystem' of https://github.com/joelb92/Vision-Sandbox into feature/AlgorithmSystem

Conflicts:
	VisionSandbox.xcodeproj/project.pbxproj
	VisionSandbox/Base.lproj/MainMenu.xib