Ignore project.xcworkspace
Merge commit 'd88ed21d1b9c66e2a1b668be6b789366cec560cb'

Conflicts:
	.gitignore