Change oil to olive oil
Merge branch 'master' of https://github.com/th2062/recipes into diff-oil

Conflicts:
	cake-recipe.txt
Merge pull request #1 from th2062/diff-oil

Change oil to olive oil