modified app.js
modified app.js
Merge branch 'dev'