map
Merge branch 'master' of https://github.com/adeadrat/Grief

Conflicts:
	grief/grief/map.txt
Update README.md
yesbox
Merge branch 'master' of https://github.com/adeadrat/Grief
Update README.md
Update README.md
Update README.md
lite serialisering
Fixed buttons
Merge branch 'master' of https://github.com/adeadrat/Grief
litte more
AlOt OfF sTuFf
Merge branch 'master' into Sebastian

Conflicts:
	grief/grief/map.txt
Merge branch 'master' of https://github.com/adeadrat/Grief

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
meh
meh.