Add peanut oil
Change to Canola oil
Merge branch 'master' of https://github.com/andyleung/recipes into different-oil

Conflicts:
	cake-recipe.txt
change the oil to canola