chilli recipe with jalapeno
Merge branch 'master' of https://github.com/JeisonPacateque/recipes

Conflicts:
	chili-recipe.txt