committing additional changes - moved logo around
ignores auto generated xcuserdata files
removed xcuserdata
ignores the DS_Store
resolves merge conflict
ignores DS_Store and xcuserdata for real this time
removes tmp files
resolves merge conflicts