hej
asdasd
Merge branch 'master' of https://github.com/Omnes/Spelprojekt
sadsda
 pasdfas
asdasdasda
asdasdas
Merge branch 'robin'
Merge branch 'master' of https://github.com/Omnes/Spelprojekt

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