branch 1x
Merge branch 'Branch1' of https://github.com/dawildcat32/test1 into Branch1

Conflicts:
	GitTest/GitTest.xcodeproj/project.xcworkspace/xcuserdata/richard.xcuserdatad/UserInterfaceState.xcuserstate