update routes
deleted renamed files
fixed merge conflict with Gemfile gem (csv)