文件的上传
Merge branch 'master' of https://github.com/iostiger/VoiceManager

Conflicts:
	VoiceManager.xcodeproj/project.xcworkspace/xcuserdata/ourstory.xcuserdatad/UserInterfaceState.xcuserstate
	VoiceManager/VoiceManager.m