diff --git a/.idea/gradle.xml b/.idea/gradle.xml
index 1248bb2..106a988 100644
--- a/.idea/gradle.xml
+++ b/.idea/gradle.xml
@@ -15,7 +15,6 @@
             <option value="$PROJECT_DIR$/app" />
           </set>
         </option>
-        <option name="resolveModulePerSourceSet" value="false" />
       </GradleProjectSettings>
     </option>
   </component>
diff --git a/.idea/misc.xml b/.idea/misc.xml
index 049e2a8..f386631 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -5,7 +5,8 @@
       <map>
         <entry key="..\:/Users/Nitta/AndroidStudioProjects/IrisClient/app/src/main/res/layout/activity_main.xml" value="0.20969202898550723" />
         <entry key="..\:/Users/Nitta/StudioProjects/IrisClient/app/src/main/res/layout/activity_main.xml" value="0.266304347826087" />
-        <entry key="..\:/Users/student/StudioProjects/IrisClient/app/src/main/res/layout/activity_main.xml" value="0.25" />
+        <entry key="..\:/Users/Student/StudioProjects/IrisClient/app/src/main/res/layout/activity_main.xml" value="0.18854166666666666" />
+        <entry key="..\:/Users/Student/StudioProjects/IrisClient/app/src/main/res/layout/activity_owner_room.xml" value="0.25" />
         <entry key="..\:/Users/student/Desktop/IrisClient/app/src/main/res/layout-land/activity_main.xml" value="0.1574074074074074" />
         <entry key="..\:/Users/student/Desktop/IrisClient/app/src/main/res/layout/activity_main.xml" value="0.1859375" />
         <entry key="..\:/Users/student/Desktop/IrisClient/app/src/main/res/layout/activity_member_room.xml" value="0.25" />
diff --git a/app/src/main/java/org/ntlab/irisclient/entities/MemberJson.java b/app/src/main/java/org/ntlab/irisclient/entities/MemberJson.java
index 67eeb76..8587791 100644
--- a/app/src/main/java/org/ntlab/irisclient/entities/MemberJson.java
+++ b/app/src/main/java/org/ntlab/irisclient/entities/MemberJson.java
@@ -1,4 +1,45 @@
 package org.ntlab.irisclient.entities;
+import java.util.List;
 
 public class MemberJson {
+    private String nickname;
+    private String belongs;
+    private boolean master;
+
+
+    public MemberJson(String nickname) {
+        this.nickname = nickname;
+        this.belongs = "n";
+        this.master = false;
+    }
+
+    //-------------------------------------
+    // setter
+    public void setNickname(String nickname){
+        this.nickname = nickname;
+    }
+
+    public void setBelongs(String belongs){
+        this.belongs = belongs;
+    }
+
+    public void setMaster(boolean master){
+        this.master = master;
+    }
+
+    //---------------------------------------
+    // getter
+
+    public String getNickname(){
+        return this.nickname;
+    }
+
+    public String getBelongs(){
+        return this.belongs;
+    }
+
+    public boolean isMaster(){
+        return this.master;
+    }
+
 }
diff --git a/app/src/main/java/org/ntlab/irisclient/entities/RoomJson.java b/app/src/main/java/org/ntlab/irisclient/entities/RoomJson.java
index 427716b..708b405 100644
--- a/app/src/main/java/org/ntlab/irisclient/entities/RoomJson.java
+++ b/app/src/main/java/org/ntlab/irisclient/entities/RoomJson.java
@@ -1,4 +1,103 @@
 package org.ntlab.irisclient.entities;
 
+import android.provider.Settings;
+
+import java.lang.reflect.Member;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
 public class RoomJson {
-}
+
+    //フィールド
+    public String rid;
+    private int state;
+    public String ownerName;
+    Map<String,Member> members= new HashMap<>();
+    Settings settings = new Settings();
+    //Game game = null;
+    private Member redMaster;
+    private Member blueMaster;
+
+    //--------------------------------------------------------------
+    public RoomJson(String rid, String owner) {
+        this.rid = rid;
+        ownerName = owner;
+    }
+
+    //--------------------------------------------------------------
+    //getter
+    public String getRid(){
+        return rid;
+    }
+
+    public String getOwnerName() {
+        return ownerName;
+    }
+
+    public Settings getSettings() {
+        return settings;
+    }
+
+    public List<Member> getMembers() {
+        List<Member> memberslist = new ArrayList<Member>(members.values()) ;
+        return memberslist;
+    }
+
+
+    public Member getRedMaster() {
+        return redMaster;
+    }
+
+    public Member getBlueMaster() {
+        return blueMaster;
+    }
+
+
+    public Member getMember(String nick) {
+        Member m = members.get(nick);
+        return m;
+    }
+
+    public void deleteMember(String nick) {
+        members.remove(nick);
+    }
+
+    public int getState() {
+        return state;
+    }
+
+
+
+
+
+    //--------------------------------------------------------------
+    //setter
+    public void setOwnerName(String ownerName) {
+        this.ownerName = ownerName;
+    }
+
+    public Member setMember(String nick) {
+        Member m = members.get(nick);
+        return m;
+    }
+
+    public void setRedMaster(Member redMaster) {
+        this.redMaster = redMaster;
+    }
+
+    public void setBlueMaster(Member blueMaster) {
+        this.blueMaster = blueMaster;
+    }
+
+    public Settings setSettings() {
+        return settings;
+    }
+
+
+
+    //--------------------------------------------------------------
+
+
+}
\ No newline at end of file
diff --git a/app/src/main/java/org/ntlab/irisclient/resources/RoomsRest.java b/app/src/main/java/org/ntlab/irisclient/resources/RoomsRest.java
index cfc2bb0..1aab2fd 100644
--- a/app/src/main/java/org/ntlab/irisclient/resources/RoomsRest.java
+++ b/app/src/main/java/org/ntlab/irisclient/resources/RoomsRest.java
@@ -42,7 +42,7 @@
     // ランダムなチーム編成を行うメソッド
     @FormUrlEncoded
     @PUT("rooms/{rid}/members")
-    Call<List<MemberJson>> putMembers(
+    Call<Void> putMembers(
             @Path("rid") String rid,
             @Field("nickname") String nickname
     );
@@ -51,7 +51,7 @@
     //自分のニックネームを送り、部屋に参加するメソッド
     @FormUrlEncoded
     @POST("rooms/{rid}/members")
-    Call<List<MemberJson>> postMembers(
+    Call<RoomJson> postMembers(
             @Path("rid") String rid,
             @Field("nickname") String nickname
     );