added encrypt.js
fixed merge conflict