checking in xcode project
Merge remote-tracking branch 'origin'
Adding configuration skeleton