client->storage addFile, still writing
Merge branch 'master' of
https://github.com/dshnightmare/DistributedFileSystem.git

Conflicts:
	src/nameserver/NameServer.java