Edited for final version.
Merge branch 'master' of https://github.com/StevenElberger/COMP182
Filled out several methods and constructors for both classes, added a test file.