If a merge conflict with pbxproj files happens, take both sides
Add a podfile with StreamingKit
Fix Podfile
Ignore a few pod-specific things
Ignore xcode artifacts
Add the pods workspace