Merge branch 'master' of http://code.nyzhwlw.com:10202/yf_elsa.cui/ninglu-frontt

# Conflicts:
#	README.md

README.md

@@ -1,7 +1,7 @@
-<<<<<<< HEAD
+
 # bigData
 
-> A Vue.js project
+ #A Vue.js project
 
 ## Build Setup
 
@@ -20,8 +20,8 @@ npm run build --report
 ```
 
 For a detailed explanation on how things work, check out the [guide](http://vuejs-templates.github.io/webpack/) and [docs for vue-loader](http://vuejs.github.io/vue-loader).
-=======
+
 # ninglu-frontt
 
 宁录项目私有化部署
->>>>>>> 7cfb7a00e5ac6b0af3b6a803b263aefe198315ec
+