Change oil type
Fix typo 'canola'
Merge branch 'master' into different-oil

Conflicts:
	cake-recipe.txt (fixed)
Merge pull request #1 from circuitcat/different-oil

Change oil type to canola and increase to 3/4 cup