Files can now be encrypted. Need to add file decryption, search, etc...
Merge origin/master