xcode config
Merge branch 'master' of https://github.com/plandevida/Ejercicio1-hoja1-TAIS

Conflicts:

Ejercicio1-hoja1-TAIS.xcodeproj/project.xcworkspace/xcuserdata/dserrano.
xcuserdatad/UserInterfaceState.xcuserstate

Ejercicio1-hoja1-TAIS.xcodeproj/xcuserdata/dserrano.xcuserdatad/xcdebugg
er/Breakpoints_v2.xcbkptlist