Editor n stuff
Bana
Merge branch 'master' of https://github.com/PutBoy/Skultorp-GameJam
Hej
Stuff
Merge branch 'master' of https://github.com/PutBoy/Skultorp-GameJam
apa
apa
Merge branch 'master' of https://github.com/PutBoy/Skultorp-GameJam

Conflicts:
	Jam/Jam/Cat.cpp
Merge branch 'vulk'

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

Conflicts:
	Jam/Jam/Ball.h
	Jam/Jam/EntityManager.cpp
	Jam/Jam/Game.cpp
	Jam/Jam/Jam.vcxproj