Signed-off-by: WEN GUO <wandergogogo@gmail.com>
Signed-off-by: WEN GUO <wandergogogo@gmail.com>
git commit -a
git commit -a
Merge branch 'master' of ssh://github.com/WenGuo571/Shogi

Conflicts:
	.classpath
	.gitignore
	.project
	.settings/com.google.appengine.eclipse.core.prefs
	.settings/com.google.gdt.eclipse.core.prefs
	.settings/com.google.gwt.eclipse.core.prefs
	.settings/org.eclipse.jdt.core.prefs
	.settings/org.eclipse.wst.common.project.facet.core.xml
	src/org/shogi/GameShogi.gwt.xml
	src/org/shogi/client/Color.java
	src/org/shogi/client/GameResult.java
	src/org/shogi/client/Piece.java
	src/org/shogi/client/Presenter.java
	src/org/shogi/client/State.java
	src/org/shogi/graphics/Graphics.java
	src/org/shogi/graphics/Graphics.ui.xml
	src/org/shogi/graphics/ShogiCss.java
	src/org/shogi/graphics/ShogiEntryPoint.java
	war/WEB-INF/lib/appengine-api-labs.jar
	war/WEB-INF/lib/appengine-endpoints-deps.jar
	war/WEB-INF/lib/appengine-endpoints.jar
	war/WEB-INF/web.xml