added welcome root, controller, and views
fixed merge conflict in routes