Merge branch 'master' of http://172.16.90.201:3000/great_transition/great_distribution

.gitignore

@@ -1 +1,17 @@
-/node_modules
+.DS_Store
+
+unpackage/
+npm-debug.log*
+yarn-debug.log*
+yarn-error.log*
+
+node_modules/
+
+# Editor directories and files
+.hbuilderx
+.idea
+.vscode
+*.suo
+*.ntvs*
+*.njsproj
+*.sln