add log
Merge branch 'master' of
https://github.com/incredibleliuchi/PKU_distrystem.git

Conflicts:
	src/client/Client.java
	src/server/storage/StorageServer.java