need app back
readded app.js
fixed merge conflicts
updating master