Merge pull request #1 from alexsales/different-oil

Change vegetable oil to canola oil
Revert "Change vegetable oil to canola oil"
Merge pull request #2 from alexsales/revert-1-different-oil

Revert "Change vegetable oil to canola oil"
Merge branch 'master' into different-oil

Change 1/2 canola to 3/4

Conflicts:
	cake-recipe.txt
Merge branch 'master' into different-oil

Add 3/4 canola oil

Conflicts:
	cake-recipe.txt