Ignore Xcode user dirs
Merge branch 'refs/heads/develop'

Conflicts:
	.gitignore
Updated ignore patterns
corrected .gitignore
Merge branch 'develop'