Instead of (port#) as the name of the client folder, changed it to CLIENT-(port#) to avoid confusion
Merge branch 'master' of
https://github.com/addicteduser/CSC611M-DropOS.git

Conflicts:
	CSC611M Simple File Sharing/src/dropos/Config.java
Merge branch 'master' of https://github.com/addicteduser/CSC611M-DropOS