completed JUnit test case, but we dont need this
Merge branch 'master' of
https://github.com/Finerminer/SWE400Project1.git