sssss
Merge branch 'forMerge'

Conflicts:
	White Cane.xcodeproj/project.pbxproj
	White Cane/WCSaveDirectionController.m
	White Cane/WCSavePointController.m