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

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

Conflicts:
	Jam/Jam/Cat.cpp