encrypted user login now working
fixed merge conflict in app.js
app.js now working