diff --git a/.idea/misc.xml b/.idea/misc.xml
index 31278b3..93ad3a1 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -6,6 +6,7 @@
         <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_game_master.xml" value="0.4239583333333333" />
+        <entry key="..\:/Users/Student/StudioProjects/IrisClient/app/src/main/res/layout/activity_member_game.xml" value="0.4239583333333333" />
         <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_create_room.xml" value="0.17571611799914494" />
         <entry key="..\:/Users/student/Desktop/IrisClient/app/src/main/res/layout/activity_enter_room.xml" value="0.17571611799914494" />
diff --git a/app/src/main/java/org/ntlab/irisclient/GameMasterActivity.java b/app/src/main/java/org/ntlab/irisclient/GameMasterActivity.java
index 2d01c58..337fea7 100644
--- a/app/src/main/java/org/ntlab/irisclient/GameMasterActivity.java
+++ b/app/src/main/java/org/ntlab/irisclient/GameMasterActivity.java
@@ -25,30 +25,21 @@
     //操作可能かどうかを記録。これがfalseの時は何のボタンを押すこともできない。
     //時間があればオフラインの動作はできるようにしたい。
     private boolean IsActive = false;
+    private String myTeam;
 
-    //Irisから必要な情報を取得
-    Iris iris = (Iris) this.getApplication();
-    private String myTeam = iris.getTeam();
-
-   @Override
+    @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_game_master);
 
-      // Fragmentを作成します
+        // Fragmentを作成します
         DrawingCardFragment fragment = new DrawingCardFragment();
-        GamePlayerListFragment RedPlayerListFragment = new GamePlayerListFragment();
-        GamePlayerListFragment BluePlayerListFragment = new GamePlayerListFragment();
-
         // Fragmentの追加や削除といった変更を行う際は、Transactionを利用します
         FragmentTransaction transaction = getSupportFragmentManager().beginTransaction();
-
         // 新しく追加を行うのでaddを使用します
         // 他にも、よく使う操作で、replace removeといったメソッドがあります
         // メソッドの1つ目の引数は対象のViewGroupのID、2つ目の引数は追加するfragment
         transaction.add(R.id.container, fragment);
-       /* transaction.add(R.id.RedPlayerListContainer, RedPlayerListFragment);
-        transaction.add(R.id.BluePlayerListContainer, BluePlayerListFragment);*/
         // 最後にcommitを使用することで変更を反映します
         transaction.commit();
 
@@ -56,6 +47,7 @@
         Iris iris = (Iris) this.getApplication();
         String rid = iris.getRid();
         String nickName = iris.getNickname();
+        myTeam = iris.getTeam();
 
         //viewModelに必用な情報をセット
         gameViewModel= new ViewModelProvider(this).get(GameViewModel.class);
@@ -67,7 +59,9 @@
         buttonProcesses();
 
         //自分が赤チームマスターの場合はヒントが入力可能
-        if(myTeam.equals("r")){
+        if(myTeam == null) {
+            System.out.println(("myteamがnullです"));
+        }else if(myTeam.equals("r")){
             IsActive = true;
         }
 
@@ -86,6 +80,7 @@
 
             }
         });
+
     }
 
     public void buttonProcesses(){
diff --git a/app/src/main/res/layout/activity_game_master.xml b/app/src/main/res/layout/activity_game_master.xml
index f533e49..e55a2f4 100644
--- a/app/src/main/res/layout/activity_game_master.xml
+++ b/app/src/main/res/layout/activity_game_master.xml
@@ -5,7 +5,7 @@
     android:id="@+id/HintAmount"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    tools:context=".GameMemberActivity">
+    tools:context=".GameMasterActivity">
 
     <Button
         android:id="@+id/finishGuessButton"