Changed my nickname to name
CHange standart merge tool
Added Pods and project.xcworkspace to gitignore