confilict

.gitignore

@@ -1,5 +1,6 @@
 # Created by .ignore support plugin (hsz.mobi)
 ### Node template
+# ---> Node
 # Logs
 logs
 *.log
@@ -82,3 +83,16 @@ dist
 
 # Service worker
 sw.*
+# Grunt intermediate storage (http://gruntjs.com/creating-plugins#storing-task-files)
+.grunt
+
+# node-waf configuration
+.lock-wscript
+
+# Compiled binary addons (http://nodejs.org/api/addons.html)
+build/Release
+
+# Dependency directory
+# https://docs.npmjs.com/misc/faq#should-i-check-my-node-modules-folder-into-git
+node_modules
+

README.md

@@ -20,3 +20,6 @@ $ yarn run generate
 ```
 
 For detailed explanation on how things work, checkout [Nuxt.js docs](https://nuxtjs.org).
+# proginn-frontend
+
+客栈前端