Replace vegetable oil with canola oil
Merge branch 'master' into different-oil

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

Replace vegetable oil with canola oil