asdasd
Merge branch 'sean'

Conflicts:
	Spelprojekt/Animal.cpp
asfaf
Merge branch 'robin'
Merge branch 'sean'