commit
Merge branch 'master' of https://github.com/tashigaofei/testCrypt

# By xiaopangjun
# Via xiaopangjun
* 'master' of https://github.com/tashigaofei/testCrypt:
  Initial commit