Change oil to canola
Merge branch 'master' into different-oil

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

Change oil to canola