новый
Merge branch 'master' of https://github.com/AndrewUshkov/ecosystem.git

Conflicts:
	ProjectInformatica/Textures/Herbivore.jpg
	ProjectInformatica/src/ProjectInformaticaPackage/Information.java