Resolved merge conflict

diff --cc changelog
index 8fa11c1,afa2137..6bc7d5e
--- 1/changelog
--- 2/changelog
+++ b/changelog
@@@ -1,10 -1,10 +1,17 @@@
 +2010-07-23  Daigo Moriwaki <daigo at debian dot org>
 +
 +      * [shogi-server]
 +        - shogi_server/league/floodgate_thread.rb: When the server run
 +          with DEBUG mode, it ended up with an undefined variable error. 
 +          This issue has been fixed.
 +
+ 2010-07-17  Daigo Moriwaki <daigo at debian dot org>
+ 
+       * [shogi-server]
+         - shogi_server.rb, shogi_server/board.rb, shogi_server/move.rb
+           - Refactoring: Board can now move_to() and move_back() a move
+             instread of deep_copy().
+ 
  2010-07-11  Daigo Moriwaki <daigo at debian dot org>
  
        * [shogi-server]