Testing with colorCubeHelper data.
Merge branch 'master' of https://github.com/JoshuaSullivan/CoreImageVideoTestbed

Conflicts:
	CoreImageVideoTestbed.xcodeproj/project.pbxproj
	CoreImageVideoTestbed/Base.lproj/Main.storyboard
	CoreImageVideoTestbed/ViewControllers/RootViewController.m