tst
Merge branch 'master' of https://github.com/PutBoy/Skultorp-GameJam into sebastian

Conflicts:
	Jam/Jam/GravityField.h
	Jam/Jam/StateManager.cpp
	Jam/Jam/main.cpp
apa
Merge branch 'master' of https://github.com/PutBoy/Skultorp-GameJam into sebastian

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