Change oil type to canola
Merge remote-tracking branch 'origin/master' into different-oil

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

Change oil type to canola