thing
Merge branch 'memo' of https://github.com/memo/VolumeRunner into daniel

Conflicts:
	VolumeRunnerApp/VolumeRunnerApp.xcodeproj/project.pbxproj
	VolumeRunnerApp/src/Camera.h
Merge branch 'daniel' of https://github.com/memo/VolumeRunner into memo