Merge branch 'master' of https://github.com/esr360/Kayzen-GS into gh-…

…pages # Conflicts: # .gitignore
esr360 · Jul 21, 2016 · 083b097 · 083b097
2 parents a51c481 + 6fd2be6
commit 083b097
Show file tree

Hide file tree

Showing 4 changed files with 942 additions and 3 deletions.
diff --git a/.gitignore b/.gitignore
@@ -3,4 +3,6 @@
 .sass-cache
 .pages
 node_modules
-todo.md
+docs
+todo.md
+tests.css