Syncing up everything
fixing merge conflict in routes.rb and schema.rb