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

Conflicts:
	Jam/Jam/Game.cpp
TRARAR
asfoasf
Merge branch 'sebastian'

Conflicts:
	Jam/Jam/AnimationManager.cpp
	Jam/Jam/AnimationManager.h
	Jam/Jam/Cat.cpp
	Jam/Jam/Utility.h