user 改了
lalala
what ?
suggestions made on methods isStatus() and setStatus()
Change Entry class and add Information class
Merge branch 'working' into dev
Merge branch 'dev' of https://github.com/plumer/diki into dev
change author name to diki
Merge branch 'dev' into working
ju ge li zi
Merge branch 'dev' of https://github.com/plumer/diki into dev

Conflicts:
	lab02/Client.java
try to push master