Jalapeno peppers are better
Merge commit '1f1d849aeb17993e4dd9db1bf218e52efe4d69e5'

Conflicts:
	SalsaRecipe.txt
Habanero wins