d
Merge branch 'master' of
https://github.com/wangzhenhuaCode/DistributedSystem.git

Conflicts:
	src/lab1/Main.java
Merge branch 'master' of https://github.com/wangzhenhuaCode/DistributedSystem.git
Main