trying git rm xcuserdata
Merge branch 'master' into rhulett
Merge branch 'rhulett' of https://github.com/cvcal/CycleOfViolence into rhulett