conflito
Merge branch 'master' of https://github.com/FeevaleCookbooks/cookbooks
Merge branch 'master' of https://github.com/FeevaleCookbooks/cookbooks
correcao list-recipe, fotos home, link home