revert changes to app.js so that eric's merge will work