I´m making another change to the file, because I now know that tomatoes are fruits.
Merge branch 'master' of https://github.com/animalena/Lab3

Conflicts:
	Conflict