junção
Merge branch 'master' of https://github.com/Hugogoodpeople/Fucook

Conflicts:

Fucook.xcodeproj/project.xcworkspace/xcuserdata/hugocosta.xcuserdatad/Us
erInterfaceState.xcuserstate