Corrected merge conflicts
Use olive oil instead of vegetable oil
Merge branch 'master' of github.com:karsibali/recipes into different-oil

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

Different oil