a ver ahora
Merge branch 'master' of https://github.com/Alfinux/Cupffee

Conflicts:

Cupfee.xcodeproj/project.xcworkspace/xcuserdata/raulC.xcuserdatad/UserIn
terfaceState.xcuserstate
Merge branch 'master' of https://github.com/Alfinux/Cupffee