999
Merge branch 'master' of https://github.com/JNCoder/Homework

Conflicts:
	CrazyBrain/CrazyBrain/Socket/TcpSocketManager.m
	CrazyBrain/CrazyBrain/View/Game/Lan/LanGameViewController.m
	lib/Debug-iphoneos/libTouchFramework.a