checkin stuff
merge app.js