Project Encryption
Merge branch 'master' of https://github.com/tomniu/encoder_