Chinese-style Recipe
Merge branch 'master' of github.com:meric117/recipes

Conflicts:
	chili-recipe.txt