Add cinnamon to the recipe
Add cinnamon to a different line so shit goes crazy
Merge remote-tracking branch 'origin/master'

Conflicts:
	chili-recipe.txt