Signed-off-by: Ben Long <benjaminplong@gmail.com>
Merge branch 'master' of https://github.com/benjaminplong/FileSharingSystem.git

Conflicts:
	src/GroupClient.java
	src/GroupThread.java

Signed-off-by: Ben Long <benjaminplong@gmail.com>