merge with master

minaorangina · Oct 25, 2016 · 71be7fc · 71be7fc
2 parents 5169500 + 79124fd
commit 71be7fc
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 52,885 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,6 +1,7 @@
 node_modules/
 npm-debug.log
+bundle.js
 .gitattributes
-public/bundle.js
+.nvmrc
+*.sh
 *.env
-env.sh
diff --git a/README.md b/README.md
@@ -16,6 +16,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