accpt 1
Merge branch 'master' of https://github.com/rahulsalvikar777/gitProjectTest

Conflicts:

gitProjectTest.xcodeproj/project.xcworkspace/xcuserdata/administrator.xc
userdatad/UserInterfaceState.xcuserstate