Use peanut oil instead of vegetable oil
Merge branch 'master' of https://github.com/gustafzong/recipes into different_oil

Conflicts:
	cake-recipe.txt
Merge pull request #1 from gustafzong/different_oil

Use peanut oil instead of vegetable oil