Merging the rest of app.js