assembling (down file partially works)
Merge branch 'master' of https://github.com/CICS525/DBLikeProject

Conflicts:
	CloudSync/Client/src/cloudsync/client/FileSysPerformer.java