添加4、5号用户
添加4、5号用户
Merge branch 'feature/addUsers' of https://github.com/julycoolwind/rebasemerge-1 into feature/addUsers

* 'feature/addUsers' of https://github.com/julycoolwind/rebasemerge-1:
  添加4、5号用户
Merge pull request #4 from julycoolwind/feature/addUsers

Feature/add users 接受4、5用户的添加唉
添加server2
Merge pull request #5 from julycoolwind/patch1

接受添加server2的patch
add test.md
Merge branch 'feature/feature2' of https://github.com/julycoolwind/rebasemerge-1 into feature/feature2

* 'feature/feature2' of https://github.com/julycoolwind/rebasemerge-1:
  add test.md