added a new spice called aloo. and step with aloo.
now two beanches will be merged.(this time i checked the merge command.)
Merge remote-tracking branch 'origin/master'

Conflicts:
	chili-recipe.txt