Signed-off-by: GameOwen <gameowencz@gmail.com>
Merge branch 'master' of https://github.com/wangzhenhuaCode/RMI.git

Conflicts:
	RMI/src/client/SocketConnection.java