updated code
Merge branch 'master' into 1

Conflicts:
	Hello/.DS_Store
	Hello/Hello.xcodeproj/project.xcworkspace/xcshareddata/Hello.xccheckout

Hello/Hello.xcodeproj/project.xcworkspace/xcuserdata/amareshkv.xcuserdat
ad/UserInterfaceState.xcuserstate