check git
Merge branch 'master' of https://github.com/paulsonvarghese/PayPalPayment

Conflicts:

TestPaypal/TestPaypal.xcodeproj/project.xcworkspace/xcuserdata/thinkpalm
.xcuserdatad/UserInterfaceState.xcuserstate