change locally chili recipe
Merge remote-tracking branch 'origin/master'
resolved conflict
Conflicts:
	chili-recipe.txt