replaced some of the logic in GenericRepo
Merge branch 'master' of https://github.com/webdude21/DatabasesTeamWork.git