Revert "gafaf"

This reverts commit 29d33d20c24a928b497833466aa64320fb9a586c.
Revert "Revert "gafaf""

This reverts commit 8d7e447f5094dafbae538a5f36a5e70661bb970b.
Merge branch 'master' into sebastian
Merge branch 'master' of https://github.com/PutBoy/Skultorp-GameJam into sebastian
sdf
event
Merge branch 'master' of https://github.com/PutBoy/Skultorp-GameJam into vulk

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