brabch2
Merge branch 'refs/heads/Branch2' into Branch3

Conflicts:
	GitTest/GitTest.xcodeproj/project.xcworkspace/xcuserdata/richard.xcuserdatad/UserInterfaceState.xcuserstate
branc 3
dodgy commit