initializing with xcodes
added gitignore
resolving gitignore conflict