update file
Merge branch 'master' of https://github.com/peigen831/ChatSockets

Conflicts:
	src/Dropbox/Client.java
	src/Dropbox/Server.java
	src/Dropbox/Subserver.java