Add branch to change oil
Update spelling for canola
Update Canola Oil
Merge branch 'master' into different-oil

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

Add branch to change oil