add gitignore
edit gitignore conflict
test 11
test 22
test 33
test 44
remove xcworkspace data