all classes and unit tests are good to go
Merge branch 'master' of https://github.com/joshuaphilippy/Assignment2