parcial 2 de friendly url
merge Gemfile.lock