diff --git a/src/main/java/com/ntlab/irisserver/models/RoomManager.java b/src/main/java/com/ntlab/irisserver/models/RoomManager.java
index e985294..0f658b0 100644
--- a/src/main/java/com/ntlab/irisserver/models/RoomManager.java
+++ b/src/main/java/com/ntlab/irisserver/models/RoomManager.java
@@ -1,9 +1,12 @@
 package com.ntlab.irisserver.models;
+import com.ntlab.irisserver.entities.Game;
+import com.ntlab.irisserver.entities.Member;
 import com.ntlab.irisserver.entities.Room;
 import org.springframework.stereotype.Component;
 
 import javax.ws.rs.*;
 import java.util.*;
+import java.util.Random;
 
 @Component
 public class RoomManager {
@@ -17,6 +20,57 @@
         return theInstance;
     }
 
+    //コンストラクタ------------------------------------------------------
+    public RoomManager(){
+        Room r = new Room("test", "aaa");
+        rooms.put("test", r);
+        r.addMember("aaa");
+
+        //メンバー設定()
+        int length = 0;
+        char[] rch;
+        rch = new char[3];
+        String rname;
+        while(length < 10){
+            for(int i = 0; i<3; i++){
+                Random random = new Random();
+                rch[i] = (char)(random.nextInt(26) + 'a');
+            }
+            rname = new String(rch);
+            r.addMember(rname);
+            List<Member> members = r.getMembers();
+            length = members.size();
+        }
+
+        //チームシャッフル
+        List<Member> m = r.getMembers();
+        Collections.shuffle(m);
+        for(int i=0; i < 10; i++){
+            if(i >= m.size())break;
+            Member info = m.get(i);
+            if(i==0){
+                info.setMaster(true);
+                r.changeTeamAndMaster(info.getNickname(), "r", true);
+            }else if(i==1){
+                info.setMaster(true);
+                r.changeTeamAndMaster(info.getNickname(), "b", true);
+            }else{
+                info.setMaster(false);
+            }
+            if(i % 2 == 0){
+                info.setBelongs("r");
+            }else{
+                info.setBelongs("b");
+            }
+        }
+
+        //gameインスタンス作成、取得
+       
+
+    }
+    //-----------------------------------------------------------------
+
+
     public Room createRoom(String owner) {
         UUID uuid = UUID.randomUUID();
         String rid = uuid.toString(); //uuid型からstring型に変換
diff --git a/src/main/java/com/ntlab/irisserver/resources/RoomsRest.java b/src/main/java/com/ntlab/irisserver/resources/RoomsRest.java
index 97995b6..29bfd01 100644
--- a/src/main/java/com/ntlab/irisserver/resources/RoomsRest.java
+++ b/src/main/java/com/ntlab/irisserver/resources/RoomsRest.java
@@ -14,17 +14,6 @@
 
 public class RoomsRest {
 
-    @GET //テスト用(すべての部屋の情報を表示)
-    @Path("/")
-    @Produces(MediaType.APPLICATION_JSON)
-    public List<Room> getRoomsInfo(){
-        RoomManager rm = RoomManager.getInstance();
-        rm.getRooms();
-        List<Room> rms = rm.getRooms();
-
-        return rms;
-    }
-
     @POST //部屋の作成,オーナーを設定
     @Path("/")
     @Produces(MediaType.APPLICATION_JSON)
@@ -59,5 +48,20 @@
         RoomManager rm = RoomManager.getInstance();
         rm.deleteRoom(rid);
     }
+
+//--------------------------------------テスト用-------------------------------------------
+
+    @GET //すべての部屋の情報を表示
+    @Path("/")
+    @Produces(MediaType.APPLICATION_JSON)
+    public List<Room> getRoomsInfo() {
+        RoomManager rm = RoomManager.getInstance();
+        rm.getRooms();
+        List<Room> rms = rm.getRooms();
+
+        return rms;
+    }
+
+
 }
 
diff --git a/src/main/java/com/ntlab/irisserver/resources/TurnsRest.java b/src/main/java/com/ntlab/irisserver/resources/TurnsRest.java
index 3ca89b2..9524bf1 100644
--- a/src/main/java/com/ntlab/irisserver/resources/TurnsRest.java
+++ b/src/main/java/com/ntlab/irisserver/resources/TurnsRest.java
@@ -33,7 +33,7 @@
     @POST //新しいターンの作成
     @Path("/{rid}/game/turns")
     @Produces(MediaType.APPLICATION_JSON)
-    public Turn addTurns(@PathParam("rid") String rid, @FormParam("nickname") String owner) {
+    public Turn addTurns(@PathParam("rid") String rid) {
 
         RoomManager rm = RoomManager.getInstance();
         Room room = rm.getRoom(rid);