addded the edit, and show methods to the resovision controller
small changes to controllers
Merge branch 'development' of github.com:alevsxm/Team-Doge into development
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
Update README.rdoc
small changes to seed file, switching to the correct branch
fixed merge conflic in seeds.rb
Merge branch 'development' of github.com:alevsxm/Team-Doge into development
additional changes to seeds.rb
modified schema
Merge branch 'development' of github.com:alevsxm/Team-Doge into development
fixed merge conflict in seeds.rb
Merge branch 'development' of github.com:alevsxm/Team-Doge into development
Made migrations to correct tables in DB; Changes to controllers; Seeded DB with one entry
added new api functionality
Merge branch 'development' of github.com:alevsxm/Team-Doge into development
pushing linkedin_test.rb for Alex