REPEAT: Use canola oil instead of vegetable oil
REPEAT: confirm *
REPEAT: Merge branch 'master' into different-oil

Conflicts:
	cake-recipe.txt
Merge pull request #2 from bodhikhalid/different-oil

REPEAT: Use canola oil instead of vegetable oil