Hecho por Tito
Merge branch 'master' of https://github.com/hpcuvi/Prueba

Conflicts:

Prueba.xcodeproj/project.xcworkspace/xcuserdata/jennypaillacho.xcuserdat
ad/UserInterfaceState.xcuserstate
OKAS
Merge branch 'master' of https://github.com/hpcuvi/Prueba

Conflicts:

Prueba.xcodeproj/project.xcworkspace/xcuserdata/jennypaillacho.xcuserdat
ad/UserInterfaceState.xcuserstate