add basil
modify as per Udacity lesson three -- simulate collaborative conflict
Merge remote-tracking branch 'origin/master'

Conflicts:
	chili-recipe.txt