Change oil type form vegetable oil to canola oil.
Merge branch 'master' of https://github.com/titan550/recipes into different-oil

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

Change oil type form vegetable oil to canola oil.