trying to get Xcode ignores in order.
Merge remote-tracking branch 'origin/master'