Added tomato
Added garlic
Merge branch 'tomato'

Conflicts:
	guacamole.txt