Comment
My Conflivt fixed

Conflicts:

TestForGit.xcodeproj/project.xcworkspace/xcuserdata/asadulin.xcuserdatad
/UserInterfaceState.xcuserstate
	TestForGit/en.lproj/MainStoryboard.storyboard