Changed vegtable oil to olive.
Merge remote-tracking branch 'origin/master' into different-oil

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

Changed vegtable oil to olive.