timer
merged app.js