hehe

gege
Merge branch 'debug-new' of https://github.com/zhangys/gitForiPhone into debug-new

Conflicts:

gitForiPhone.xcodeproj/project.xcworkspace/xcuserdata/Eason.xcuserdatad/
UserInterfaceState.xcuserstate