local master changes
changed config/routes.rb again to remove welcome
Fixed routes.rb root path conflict