omg ponies
Merge branch 'master' of github.com:pmallory/recipes

Conflicts:
	chili-recipe.txt