Fixed FileThread errors
Merge branch 'master' of https://github.com/tdoshea90/cs1653-2

Conflicts:
	src/FileThread.java
add/remove users from group
Merge branch 'master' of https://github.com/tdoshea90/cs1653-2
add/delete user to group implementation