new commit
adfdfthb
Merge branch 'test'

Conflicts:

anotherSample/anotherSample.xcodeproj/project.xcworkspace/xcuserdata/cha
ithra.xcuserdatad/UserInterfaceState.xcuserstate
	anotherSample/anotherSample/ViewController.m