Add cinnamon to chili (just 'cus)
Merge remote-tracking branch 'origin/master'

Conflicts:
	chili-recipe.txt