commented out encrypt.js
merge