Changed the oil type
Changed canoli t canola
Merge branch 'master' into different-oil

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

Changed the oil type