Change cake recipe to use canola oil instead of vegetable oil
Fix Canola oil typo
Change cake_recipe with Sarah's changes of 3/4 cup of oil
Merge branch 'master' into different-oil

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

Change cake recipe to use canola oil instead of vegetable oil