Added new oil
Fix inedible ingredient
Merge branch 'master' into different-oil

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

Added new oil