ygi
Merge branch 'master' of https://github.com/Omnes/Spelprojekt

Conflicts:
	Spelprojekt/Animal.cpp
	Spelprojekt/Gui.cpp