misc
misc
Merge branch 'master' of https://github.com/WiJeBe/Arkardmaskin

Conflicts:
	ProjectJumpyTHing/ProjectJumpyThing/AnimatedGameObject.cs
	ProjectJumpyTHing/ProjectJumpyThing/GameObject.cs