dumped app.js content
fixed merge conflicts
small tweeks