Change canola to olive oil
Fix typo.
Fix merge conflict.

Merge branch 'master' of https://github.com/goraw/recipes into different-oil

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

Change canola to olive oil