Merge branch 'master' into redux

minaorangina · Oct 25, 2016 · 7b78190 · 7b78190
2 parents 1723183 + 71be7fc
commit 7b78190
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,7 +1,7 @@
 node_modules/
 npm-debug.log
+bundle.js
 .gitattributes
-public/.bundle.js
-*.env
 *.sh
+*.env
 .nvmrc
diff --git a/README.md b/README.md
@@ -18,6 +18,6 @@ Simple as that :smile:
 ###[I'm keeping track of any problems or bugs encountered here](https://github.com/minaorangina/run/blob/master/problems-solutions.md)
 
 ## TODO
-- [ ] Add Redux
+- [x] Add Redux
 - [x] Swap babelify for webpack
 - [x] Add styles