yep, nom nom
Merge remote-tracking branch 'origin/master'
yeah blah oil
Merge branch 'master' of https://github.com/Slomer/recipes
Merge branch 'master' into different-oil

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

Different oil