olive oil
fixed a typo
Merge branch 'master' into different-oil

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

olive oil