issue 1
Merge branch 'testing'

Conflicts:

MyPlayerSecret.xcodeproj/project.xcworkspace/xcuserdata/looip.xcuserdata
d/UserInterfaceState.xcuserstate
	MyPlayerSecret/AppDelegate.m
解决冲突