pull from origin on github to update bad changes on local comp
route change to fix erros in test related to id
reverting routes.rb, to what they were before i started to fix the errors test were throwing in regard to id being not found