merging encrypt/decrypt
Merge branch 'master' of https://github.com/joshblum/fakeblock
Merge branch 'master' of https://github.com/joshblum/fakeblock
fixing draft decrypt bug blech