Nvm this one
Merge remote-tracking branch 'origin/collision-map' into collision-map

Conflicts:
	RetardedGame/Player.cpp
	RetardedGame/x64/Debug/RetardedGame.log
	RetardedGame/x64/Debug/RetardedGame.tlog/CL.write.1.tlog
	RetardedGame/x64/Debug/vc120.idb
	RetardedGame/x64/Debug/vc120.pdb
	x64/Debug/RetardedGame.exe
	x64/Debug/RetardedGame.ilk
	x64/Debug/RetardedGame.pdb