anim
anim
Merge branch 'master' into vulk

Conflicts:
	Jam/Jam/State.h
ani
asd
Cat
anim
anim
Merge branch 'vulk'

Conflicts:
	Jam/Jam/Jam.vcxproj
	Jam/Jam/Jam.vcxproj.filters
Rolf
Merge branch 'master' of https://github.com/PutBoy/Skultorp-GameJam
Merge branch 'Elias'
an
Merge branch 'master' of https://github.com/PutBoy/Skultorp-GameJam into vulk
Fisk
Merge branch 'master' of https://github.com/PutBoy/Skultorp-GameJam

Conflicts:
	Jam/Jam/Jam.vcxproj
	Jam/Jam/Jam.vcxproj.filters
asd
meh
Merge branch 'master' of https://github.com/PutBoy/Skultorp-GameJam into vulk
asd