added master branch's xcuserdata to .gitignore
Merge branch 'christopher'