create complete
Merge branch 'server-fs' of https://github.com/henchill/encrypted_file_system into server-fs