Git-fix
fix
Merge pull request #7 from adeadrat/Sebastian

Sebastian
Merge branch 'master' of https://github.com/adeadrat/Grief
FINALLY
Merge remote-tracking branch 'origin/master' into Sebastian

Conflicts:
	grief/grief/Map.cpp
	grief/grief/main.cpp

omgomgomg, conflicts fixed
liek aaaaaaaaaaaaaaaw