change vegetable oil to peanut oil
Merge branch 'master' of https://github.com/jvalenci/recipes into different-oil

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

change vegetable oil to peanut oil