One more try at pull request and merge conflicts
Changing vegetable oil to canola
Merge branch 'master' of github.com:dannc/recipes into different-oil

Conflicts:
	cake-recipe.txt
reduce amount of oil
Merge branch 'master' into different-oil

Conflicts:
	cake-recipe.txt
Add more oil
Merge branch 'master' of github.com:dannc/recipes
Merge branch 'master' into different-oil

Conflicts:
	cake-recipe.txt
Merge pull request #2 from dannc/different-oil

Different oil