change to canola oil
change to olive oil
Merge branch 'master' into different-oil

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

change to canola oil