Merge branch 'test'

Conflicts:

anotherSample/anotherSample.xcodeproj/project.xcworkspace/xcuserdata/cha
ithra.xcuserdatad/UserInterfaceState.xcuserstate
	anotherSample/anotherSample/ViewController.m
.m
Update .gitignore
Merge branch 'test'

Conflicts:

anotherSample/anotherSample.xcodeproj/project.xcworkspace/xcuserdata/cha
ithra.xcuserdatad/UserInterfaceState.xcuserstate
.m
updated
ggfhfff
utrfrfgf
fgcgh
comment
update
Merge branch 'test' into chaithra
Merge branch 'master' into chaithra

Conflicts:
	anotherSample/anotherSample/ViewController.m