Modified cake-recipe.txt
CAKE CHANGE
Merge branch 'master' into different-oil

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

Modified cake-recipe.txt