initial commit, minor changes to app.route
fixed merge conflicts