Merge branch 'master' of http://192.168.1.220:10080/lincl/custom-components

# Conflicts:
#	README.md

README.md

@@ -1,18 +1,3 @@
# custom-components
> A Vue.js project
## Build Setup
``` bash
# install dependencies
npm install
# serve with hot reload at localhost:8080
npm run dev
# build for production with minification
npm run build
```
For detailed explanation on how things work, consult the [docs for vue-loader](http://vuejs.github.io/vue-loader).
vue自定义组件，基于elementui