changes
Merge branch 'master' of https://github.com/kareem1234/2404-project
Polymorphism all the way and controller updated with these changes as well as the controller