add conola oil
Merge branch 'master' of https://github.com/dstarmanhr/recipes into different-oil

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

add conola oil