Change oil type
Merge branch 'master' into canola

Conflicts:
	cake-recipe.txt
Merge pull request #1 from macflav/canola

Change oil type