Signed-off-by: CCJoy <ccwang.joy@gmail.com>
Merge branch 'master' of https://github.com/handsomeTom/mblog.git

Conflicts:
	WebRoot/WEB-INF/classes/mblog/app/PaintAndGuess$AppConnection.class

Signed-off-by: CCJoy <ccwang.joy@gmail.com>
Merge branch 'master' of https://github.com/handsomeTom/mblog.git

Conflicts:
	WebRoot/WEB-INF/classes/mblog/app/PaintAndGuess$AppConnection.class
Merge branch 'master' of https://github.com/handsomeTom/mblog.git

Conflicts:
	.classpath
	.settings/org.eclipse.core.resources.prefs
	.settings/org.eclipse.wst.common.project.facet.core.xml
	WebRoot/WEB-INF/classes/mblog/Bean/AppRequest.class
	WebRoot/WEB-INF/classes/mblog/Bean/AppResponse.class
	WebRoot/WEB-INF/classes/mblog/Bean/Game.class
	WebRoot/WEB-INF/classes/mblog/app/PaintAndGuess$AppConnection.class
	WebRoot/WEB-INF/classes/mblog/app/PaintAndGuess$PlayerStatus.class
	WebRoot/WEB-INF/classes/mblog/app/PaintAndGuess$RequestTypes.class
	WebRoot/WEB-INF/classes/mblog/app/PaintAndGuess$ResponseTypes.class
	WebRoot/WEB-INF/classes/test/test1$A.class
	WebRoot/WEB-INF/classes/test/test1$B.class
	WebRoot/WEB-INF/classes/test/test1.class
	WebRoot/WEB-INF/classes/util/CopyOnWriteMap.class

Signed-off-by: CCJoy <ccwang.joy@gmail.com>
Signed-off-by: CCJoy <ccwang.joy@gmail.com>