Merge branch 'redux' into universal-redux

Author: diegohaz

package.json

@@ -87,7 +87,7 @@
     "redux-saga": "^0.14.0",
     "redux-thunk": "^2.1.0",
     "serialize-javascript": "^1.3.0",
-    "styled-components": "^1.0.7",
+    "styled-components": "1.1.1",
     "url-loader": "^0.5.7",
     "validator": "^6.1.0",
     "webpack": "^1.13.2",

src/components/App.js

@@ -1,7 +1,9 @@
-import React, { Component, PropTypes } from 'react'
-import { injectGlobal } from 'styled-components'
+import React, { PropTypes, Component } from 'react'
+import { injectGlobal, ThemeProvider } from 'styled-components'
 import Helmet from 'react-helmet'
 
+import theme from './theme'
+
 injectGlobal`
   body {
     margin: 0;
@@ -31,7 +33,7 @@ class App extends Component {
           link={[
             { rel: 'icon', href: 'https://diegohaz.github.io/arc/icon.png' }
           ]} />
-        {children}
+        <ThemeProvider theme={theme}>{children}</ThemeProvider>
       </div>
     )
   }