addded the edit, and show methods to the resovision controller
small changes made to routes.rb and controller files
fixed merge conflict in routes.rb file
Merge branch 'resovision_controller2' of github.com:alevsxm/Team-Doge into development
filled out controller files
filling out first entry in seed file