map
man a give
map
Merge branch 'Jimmy'

Conflicts:
	grief/grief/map.txt
apa
Merge branch 'Sebastian'
Merge branch 'master' of https://github.com/adeadrat/Grief
Merge branch 'master' into Anton
filterfix
Merge branch 'master' of https://github.com/adeadrat/Grief

Conflicts:
	grief/grief/grief.vcxproj.filters
fix
filter!
fix
Merge branch 'master' of https://github.com/adeadrat/Grief

Conflicts:
	grief/grief/grief.vcxproj.filters
Merge branch 'Jimmy'
Filter
Merge branch 'master' of https://github.com/adeadrat/Grief
FK ANTON!
comments
guifix?