Signed-off-by: Sean Cardello <seanmc602@gmail.com>
Merge branch 'master' of git@github.com:benjaminplong/FileSharingSystem.git

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

Signed-off-by: Sean Cardello <seanmc602@gmail.com>