ResourceManager load/save-file + Class Diagram
Class Diagram
Merge remote-tracking branch 'origin/Sebastian'
jump
Merge branch 'jimmy'

Conflicts:
	grief/grief/map.txt
ignore map.txt
Merge branch 'Anton'
ignore map.txt
sfui to project
jump2
Merge branch 'Jimmy'
main
Merge branch 'Sebastian'

Conflicts:
	grief/grief/main.cpp
main
Merge branch 'master' of https://github.com/adeadrat/Grief

Conflicts:
	grief/grief/main.cpp
Camera/jump/Keyboard
Vettefan
Merge branch 'Sebastian'

Conflicts:
	grief/grief/Player.cpp
player
utökat display