Replace oil
Correct typo
Merge branch 'master' into different-oil

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

Replace oil