Updated routes.rb, added 'welcome#index' as root route
local master changes
changed config/routes.rb again to remove welcome
Fixed routes.rb root path conflict
fixed the routes.rb one more time