Add marjoram to chili-recipe.txt
Merge remote-tracking branch 'origin/master'

Conflicts:
	chili-recipe.txt