add basil to cooking
Merge remote-tracking branch 'origin/master'

Conflicts:
	chili-recipe.txt
new commit added, testing
Merge branch 'master' of https://github.com/kren1221/recipes

Conflicts:
	cake-recipe.txt