Combined the Classes
Added stuff
Merge https://github.com/manuella/CSC207-HW2