lite serialisering
litte more
Merge branch 'master' into Sebastian

Conflicts:
	grief/grief/map.txt
CollisionMapSerializer typ klar
Merge branch 'master' of https://github.com/adeadrat/Grief into Sebastian

Conflicts:
	grief/grief/Player.cpp
	grief/grief/grief.vcxproj
	grief/grief/map.txt