Merge branch 'master' of funnelenvy.github.com:FunnelEnvy/optimizely-cli

johnhenry · johnhenry · commit b3314290fac1 · 2015-01-16T09:34:27.000-08:00
Conflicts:
	.gitignore
diff --git a/package.json b/package.json
@@ -44,4 +44,4 @@
     "nexpect": "^0.4.2",
     "quick-temp": "^0.1.2"
   }
-}
+}
