Removed .xcworkspace from .gitignore
Added workspace
Merge remote into local
Added all untracked files