change the oil type
Merge branch 'different-oil'

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

change the oil type