recover
Merge branch 'master' of https://github.com/zkyscraper/----0.2

Conflicts:
	有意见
0.2.xcodeproj/project.xcworkspace/xcuserdata/shao.xcuserdatad/UserInterf
aceState.xcuserstate
recover