up
Merge branch 'master' of github.com:al03/CameraManual

Conflicts:
	CameraManual.xcodeproj/project.xcworkspace/xcshareddata/CameraManual.xccheckout