change chill-recipe
Merge remote-tracking branch 'origin/master'

Conflicts:
	chili-recipe.txt
change oil
Merge branch 'master' of github.com:nickliverpool/recipes
Merge branch 'different-oil'

Conflicts:
	cake-recipe.txt