Change to a healthier oil
Merge branch 'master' of https://github.com/kwalcock/recipes into different-oil

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

Change to a healthier oil