update .gitignore
remove all of the xcuserdata from git
merge