ignore map.txt
sfui to project
Merge branch 'Anton'
ignore map.txt
sfui to project
Merge branch 'Jimmy'
main
Merge branch 'Sebastian'

Conflicts:
	grief/grief/main.cpp
Camera/jump/Keyboard
Merge branch 'master' into Jimmy