merge test app
mod app.js
add js