Edited the Chili Recipe so that we can have merge conflicts from local and GitHub commits.
Merge remote-tracking branch 'origin/master'

Conflicts:
	chili-recipe.txt