Merge branch 'dev'

KuroGuo · Jun 28, 2015 · 274e632 · 274e632
2 parents ce78a9f + eade36b
commit 274e632
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/README.md b/README.md
@@ -0,0 +1,3 @@
+iro
+=======
+colorful
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
-  "name": "tug-of-war",
-  "version": "1.0.0",
+  "name": "iro",
+  "version": "0.2.0",
   "main": "app.js",
   "author": "Kuro",
   "scripts": {