diff --git a/src/main/java/com/ntlab/irisserver/entities/Game.java b/src/main/java/com/ntlab/irisserver/entities/Game.java
index 145b2b0..2f3365b 100644
--- a/src/main/java/com/ntlab/irisserver/entities/Game.java
+++ b/src/main/java/com/ntlab/irisserver/entities/Game.java
@@ -1,5 +1,7 @@
 package com.ntlab.irisserver.entities;
 
+import com.ntlab.irisserver.models.KeywordManager;
+
 import java.util.*;
 
 public class Game {
@@ -18,7 +20,10 @@
     private DrawingController drawingController = null;
     private Settings settings = null;
 
-    public Game(Room room) {
+    public Game(Room room, String[] keywords) {
+
+        room.setGame(this);
+
         List<Member> memberList = room.getMembers();
         int num = 16/memberList.size();//一人あたりが確実に採用されるイラスト枚数
         int cnt = 0;
@@ -42,6 +47,7 @@
 
         for(int i=0; i<16; i++) map.add(i);
         Collections.shuffle(map);//0～15のdnoをランダムにマップに割り振る
+        System.out.println(map);
         //r:6 b:5 g:4 d:1
         for(int i=0; i<6; i++) color.add("r");
         for(int i=0; i<5; i++) color.add("b");
@@ -60,7 +66,6 @@
             c.setColor(color.get(i));
             c.setDno(map.get(i));
         }
-
     }
 
     public DrawingController getDrawingController() {