Testing to see if connor_branch shows up on remote git
Add .gitignore file
Resolve conflicts with merge
Remove .xccheckout