util
apa
Merge branch 'master' of https://github.com/PutBoy/Skultorp-GameJam into sebastian

Conflicts:
	Jam/Jam/AnimationManager.cpp
	Jam/Jam/Ball.cpp
	Jam/Jam/Ball.h
	Jam/Jam/Cat.cpp
	Jam/Jam/Cat.h
Merge branch 'master' of https://github.com/PutBoy/Skultorp-GameJam into sebastian

Conflicts:
	Jam/Jam/Cat.cpp
	Jam/Jam/Game.cpp