как обычно

глобально
Merge branch 'master' of https://github.com/skad0/platform-peng

Conflicts:
	game/game/Debug/CL.read.1.tlog
	game/game/Debug/CL.write.1.tlog
	game/game/Debug/cl.command.1.tlog
	game/game/Debug/game.exe
	game/game/Debug/game.ilk
	game/game/Debug/game.log
	game/game/Debug/game.pdb
	game/game/Debug/link.command.1.tlog
	game/game/Debug/main.obj
	game/game/Debug/tinystr.obj
	game/game/Debug/tinyxml.obj
	game/game/Debug/tinyxmlerror.obj
	game/game/Debug/tinyxmlparser.obj
	game/game/Debug/vc100.idb
	game/game/Debug/vc100.pdb
	game/game/absall.h
	game/game/game.sdf
	game/game/game.suo
	game/game/game.vcxproj
	game/game/game.vcxproj.filters
	game/game/gamecl.h
	game/game/ipch/game-3f1a65d1/game-e1e59f66.ipch
	game/game/main.cpp
	game/game/menu.h