Post-conflict merge 1

Resolved conflicts in Xcode (bad idea). Check for errors!