Merge pull request #1 from bluefork/different-oil

Change oil from vegetable to olive
Merge branch 'master' into different-oil
Merge pull request from more-oil

Add more oil so the cake is more moist!
Merge branch 'master' of https://github.com/bluefork/recipes into different-oil

Conflicts:
	cake-recipe.txt