Xcode changes
Merge remote-tracking branch 'origin/master'
Tests version control in Xcode