
'use strict';

import { combineReducers } from 'redux-immutable';

import session from './session';
import challenge from './challenge';
import modal from './modal';
import test from './test';
import timer from './timer';

export default combineReducers({
  session,
  challenge,
  modal,
  test,
  timer
});

@@ -72,31 +72,35 @@
 ort 
-session from './session
+challenge from './challenge
 ';%0Ai
@@ -101,33 +101,36 @@
 ge';%0Aimport 
-challenge
+gamesettings
  from './cha
@@ -122,33 +122,36 @@
 ngs from './
-challenge
+gamesettings
 ';%0Aimport mo
@@ -170,16 +170,92 @@
 modal';%0A
+import playerstatus from './playerstatus';%0Aimport session from './session';%0A
 import t
@@ -340,19 +340,8 @@
 s(%7B%0A
-  session,%0A
   ch
@@ -351,21 +351,64 @@
 enge,%0A  
-modal
+gamesettings,%0A  modal,%0A  playerstatus,%0A  session
 ,%0A  test

add gamesettings, playerstatus