Replace salsepareille by poudre de perlinpinpin
Merge branch 'master' into different-oil

Conflicts:
	chili-recipe.txt
Merge pull request #1 from antonioquepasa/different-oil

Replace salsepareille by poudre de perlinpinpin and add the canola oil.