Test commit.
Restoring source, adding Xcode proj.
Attempt to resolve conflict with working copy.
Xcode prep.