Step 1. Checkout the branch we are going to merge and pull in the code
git checkout -b adam/gulu-vue-master master git pull http://121.40.31.31:8888/adam/gulu-vue.git master
Step 2. Merge the branch and push the changes to GitLab
git checkout master git merge --no-ff adam/gulu-vue-master git push origin master
给项目加上package.json 让所有开发人员都可以和npm一起合并后，进行开发。 把原来的文件纳入到src文件夹中
mentioned in commit a6c702
