Stuff
Yarn ball
Merge branch 'Elias'
Merge branch 'master' of https://github.com/PutBoy/Skultorp-GameJam

Conflicts:
	Jam/Jam/Cat.cpp
Hej
Hej
Hej
Bajs
apa
Merge branch 'master' of https://github.com/PutBoy/Skultorp-GameJam

Conflicts:
	Jam/Jam/Cat.cpp
Merge branch 'master' into Elias

Conflicts:
	Jam/Jam/Display.cpp
	Jam/Jam/Jam.vcxproj
Hej
Display
Merge branch 'master' of https://github.com/PutBoy/Skultorp-GameJam into vulk

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