Actualizacion

Union de Branches
No se que es 2

No se que es 2
Merge branch 'betaos'

Conflicts:

computer.xcodeproj/project.xcworkspace/xcuserdata/betaos.xcuserdatad/Use
rInterfaceState.xcuserstate