Change cake oil from vegtable to olive
Merge branch 'master' into different-oil

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

Change cake oil from vegtable to olive