Xcode forces this to be committed
Merge remote-tracking branch 'origin/master'
modified structure