Changed vegetal oil for canola oil
Merge branch 'master' into different-oil

Conflicts:
	cake-recipe.txt
Merge pull request #1 from infinitydark/different-oil

Changed vegetal oil for canola oil