Add Chipolate to Chili recipe
Merge branch 'master' of https://github.com/ro-udacity/recipes

Conflicts:
	chili-recipe.txt