diff --git a/src/main/java/com/ntlab/irisserver/entities/Game.java b/src/main/java/com/ntlab/irisserver/entities/Game.java
index 1e53d0a..4f732bd 100644
--- a/src/main/java/com/ntlab/irisserver/entities/Game.java
+++ b/src/main/java/com/ntlab/irisserver/entities/Game.java
@@ -9,16 +9,18 @@
     private Map<Integer, String> keywordList = new HashMap<>();
     private List<Integer> map = new ArrayList<>();
     private List<String> color = new ArrayList<>();
-    private String turn = "none";
+    //private String turn = "none";
     private List<Boolean> opens = new ArrayList<>();
     private DrawingController drawingController = null;
-    private Settings settings;
+    private Settings settings = null;
+    private List<Turn> turnList = new ArrayList<>();
+    private Turn nowTurn = null;
 
     public Game(Room room) {
 
         this.settings = room.getSettings();
         for(int i=0; i<16; i++) map.add(i);
-        Collections.shuffle(map);//0～16のdnoをランダムにマップに割り振る
+        Collections.shuffle(map);//0～15のdnoをランダムにマップに割り振る
 
         //r:6 b:5  g:4, d:1
         for(int i=0; i<6; i++) color.add("r");
@@ -82,8 +84,10 @@
     public List<String> getColor(){
         return color;
     }
-    public String getTurn(){
-        return turn;
+
+    public String getTeam(){
+        String team = nowTurn.getTeam();
+        return team;
     }
 
     public List<Boolean> getOpens(){
@@ -92,4 +96,14 @@
     public Settings getSettings(){
         return this.settings;
     }
+
+    public void createTurn(){
+        nowTurn = new Turn();
+        if(turnList.size()%2==0){//偶数ターンなら青い色，奇数ターンは赤色
+            nowTurn.setTeam("b");
+        }else{
+            nowTurn.setTeam("r");
+        }
+        this.turnList.add(nowTurn);
+    }
 }
diff --git a/src/main/java/com/ntlab/irisserver/resources/GameRest.java b/src/main/java/com/ntlab/irisserver/resources/GameRest.java
index 67a4fb8..03c3544 100644
--- a/src/main/java/com/ntlab/irisserver/resources/GameRest.java
+++ b/src/main/java/com/ntlab/irisserver/resources/GameRest.java
@@ -8,6 +8,8 @@
 import javax.ws.rs.GET;
 import javax.ws.rs.Path;
 import javax.ws.rs.PathParam;
+import javax.ws.rs.Produces;
+import javax.ws.rs.core.MediaType;
 import java.util.List;
 
 @Component
@@ -15,6 +17,7 @@
 public class GameRest {
     @GET
     @Path("/{rid}/game/map")
+    @Produces(MediaType.APPLICATION_JSON)
     public List<Integer> getMap(@PathParam("rid") String rid){
         RoomManager rm = RoomManager.getInstance();
         Room room = rm.getRoom(rid);
@@ -25,6 +28,7 @@
 
     @GET
     @Path("/{rid}/game/color")
+    @Produces(MediaType.APPLICATION_JSON)
     public List<String> getColor(@PathParam("rid") String rid){
         RoomManager rm = RoomManager.getInstance();
         Room room = rm.getRoom(rid);
diff --git a/src/main/java/com/ntlab/irisserver/resources/GameStateRest.java b/src/main/java/com/ntlab/irisserver/resources/GameStateRest.java
index f7ef346..f510d2f 100644
--- a/src/main/java/com/ntlab/irisserver/resources/GameStateRest.java
+++ b/src/main/java/com/ntlab/irisserver/resources/GameStateRest.java
@@ -8,6 +8,8 @@
 import javax.ws.rs.GET;
 import javax.ws.rs.Path;
 import javax.ws.rs.PathParam;
+import javax.ws.rs.Produces;
+import javax.ws.rs.core.MediaType;
 import java.util.List;
 
 @Component
@@ -16,6 +18,7 @@
 public class GameStateRest {
     @Path("/{rid}/game/opens")
     @GET
+    @Produces(MediaType.APPLICATION_JSON)
     public List<Boolean> getOpens(@PathParam("rid") String rid){
         RoomManager rm = RoomManager.getInstance();
         Room room = rm.getRoom(rid);
@@ -26,11 +29,12 @@
 
     @Path("/{rid}/game/turn")
     @GET
-    public String getTurn(@PathParam("rid") String rid) {
+    @Produces(MediaType.APPLICATION_JSON)
+    public String getTeam(@PathParam("rid") String rid) {
         RoomManager rm = RoomManager.getInstance();
         Room room = rm.getRoom(rid);
         Game game = room.getGame();
-        String turn = game.getTurn();
+        String turn = game.getTeam();
         return turn;
     }
 }