ignore map.txt
sfui to project
jump/freemove/Camera
camera
Merge branch 'master' into Jimmy
c
Merge branch 'master' into Jimmy

Conflicts:
	grief/grief/Display.cpp
Merge branch 'master' into Jimmy

Conflicts:
	grief/grief/Display.cpp
disapear!
Merge branch 'master' into Jimmy

Conflicts:
	grief/grief/Guihelp.cpp
	grief/grief/grief.vcxproj.filters
	grief/grief/main.cpp
	grief/grief/map.txt
Merge branch 'master' into Jimmy

Conflicts:
	grief/grief/map.txt
Merge branch 'Jimmy'