fixed the dumb "fix"
routes and admin conflicts
gemfile conflicts
Merge branch 'master' of github.com:Silenthillnight/cs169

gemfile conflicts
rcov added
rcov added gitignore updated to ignore coverage folder