tset
Merge branch 'test' of
https://github.com/gycrazydog/distributed-algorithm into test

Conflicts:
	DA-Lab3/Resource/Logs.log