Uptate app.js
Merge https://www.github.com/umass-cs-326/team-flamenco