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

# Via 林鑫 (3) and mydemouser (2)
* 'feature/feature2' of https://github.com/julycoolwind/rebasemerge-1:
  add test.md
  添加server2
  添加4、5号用户
  添加4、5号用户