new
Merge branch 'master' of github.com:emanchen/GitEncryption