Change oil ingredient in cake-recipe to canola.
Merge branch 'master' into different-oil

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

Change oil ingredient in cake-recipe to canola.