Replace type of oil
Merge branch 'master' into different-oil

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

Replace type of oil