Use canola oil instead of vegetable oil
Merge branch 'master' into different-oil

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

Use canola oil instead of vegetable oil