asd
.gitignore is now working
xml ani
Merge branch 'master' of https://github.com/PutBoy/Skultorp-GameJam into vulk

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

Conflicts:
	Jam/Jam/AnimationManager.cpp
	Jam/Jam/Cat.cpp
	Jam/Jam/Game.cpp
	Jam/Jam/Jam.vcxproj
Merge branch 'master' of https://github.com/PutBoy/Skultorp-GameJam into vulk
walk
sfml
asd
fix
Merge remote-tracking branch 'origin/master' into vulk
jump
Merge branch 'master' of https://github.com/PutBoy/Skultorp-GameJam into vulk

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