Initial Commit
first commit. added gitignore for iOS project
modified conflict