para o vitror
Merge branch 'master' of https://github.com/Hugogoodpeople/Fucook

Conflicts:
	Fucook.xcodeproj/project.pbxproj