Merge pull request from more-oil

Add more oil so the cake is more moist!
Fix merge conflict.

Merge branch 'master' of https://github.com/goraw/recipes into different-oil

Conflicts:
	cake-recipe.txt