Fisk
Merge branch 'master' of https://github.com/PutBoy/Skultorp-GameJam

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

Conflicts:
	Jam/Jam/AnimationManager.cpp
.gitignore is now working
Hej